Removed old python2 bb-workers, new, non-pushing cloudbuild.yml

2020-02-12 10:03:11 -05:00 · 2020-02-12 10:03:11 -05:00 · bcf2a0241c
parent 730359c289
commit bcf2a0241c
11 changed files with 201 additions and 474 deletions
--- a/bb-worker/Dockerfile.apt-dumb-init.python3.7
+++ b/bb-worker/Dockerfile.apt-dumb-init.python3.7
@ -1,5 +1,5 @@
 ARG FROMBASEOS
-FROM $FROMBASEOS-build-python:3.7
+FROM gcr.io/zcash-web/bb-worker-$FROMBASEOS-build-python:3.7
 ARG DEBIAN_FRONTEND=noninteractive
 ARG DUMBINIT_VERSION=1.2.2

--- a/bb-worker/Dockerfile.debian10
+++ b/bb-worker/Dockerfile.debian10
@ -1,62 +0,0 @@
-FROM debian:10
-ARG DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update \
-    && apt-get install -y \
-       build-essential \
-       autoconf \
-       cmake \
-       pkg-config \
-       curl \
-       git \
-       wget \
-       python-dev \
-       python-pip \
-       libtool \
-       lcov \
-       valgrind \
-       dumb-init \
-       bsdmainutils \
-       python-requests \
-    && pip install \
-       virtualenv \
-       pyblake2 \
-       pip
-
-# Buildbot user
-ARG BUILDBOT_USER=zcbbworker
-ARG BUILDBOT_UID=2001
-RUN useradd --home-dir /home/$BUILDBOT_USER \
-            --shell /bin/bash \
-            --create-home \
-            --uid $BUILDBOT_UID\
-            $BUILDBOT_USER
-
-USER $BUILDBOT_USER
-WORKDIR /home/$BUILDBOT_USER
-
-RUN /usr/local/bin/virtualenv venv \
-    && . venv/bin/activate \
-    && pip install \
-       buildbot-worker \
-       pyflakes \
-       pyblake2 \
-       pyzmq \
-       requests \
-       twisted[tls]
-
-# Buildbot worker
-ARG BUILDBOT_WORKER_NAME=debian8-docker
-ARG BUILDBOT_WORKER_PASS=thisgetssetwhenpodisstarted
-ARG BUILDBOT_MASTER_HOST=dev-ci.z.cash
-ARG BUILDBOT_MASTER_PORT=9899
-
-WORKDIR /home/$BUILDBOT_USER
-RUN venv/bin/buildbot-worker create-worker $BUILDBOT_WORKER_NAME \
-      $BUILDBOT_MASTER_HOST:$BUILDBOT_MASTER_PORT \
-      $BUILDBOT_WORKER_NAME $BUILDBOT_WORKER_PASS \
-    && echo "OS: Debian 10" > $BUILDBOT_WORKER_NAME/info/host
-ADD buildbot.tac $BUILDBOT_WORKER_NAME/buildbot.tac
-
-WORKDIR /home/$BUILDBOT_USER/$BUILDBOT_WORKER_NAME
-CMD ["/usr/bin/dumb-init", "../venv/bin/twistd", "--pidfile=", "-ny", "buildbot.tac"]
--- a/bb-worker/Dockerfile.debian8
+++ b/bb-worker/Dockerfile.debian8
@ -1,64 +0,0 @@
-FROM debian:8
-ARG DEBIAN_FRONTEND=noninteractive
-ARG DUMBINIT_VERSION=v1.2.2
-RUN apt-get update \
-    && apt-get install -y \
-       build-essential \
-       autoconf \
-       cmake \
-       pkg-config \
-       curl \
-       git \
-       wget \
-       python-dev \
-       python-pip \
-       libtool \
-       lcov \
-       valgrind \
-       bsdmainutils \
-       python-requests \
-    && pip install \
-       virtualenv \
-       pyblake2 \
-       pip
-
-RUN wget -O /usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.2/dumb-init_1.2.2_amd64
-RUN chmod +x /usr/bin/dumb-init
-
-# Buildbot user
-ARG BUILDBOT_USER=zcbbworker
-ARG BUILDBOT_UID=2001
-RUN useradd --home-dir /home/$BUILDBOT_USER \
-            --shell /bin/bash \
-            --create-home \
-            --uid $BUILDBOT_UID\
-            $BUILDBOT_USER
-
-USER $BUILDBOT_USER
-WORKDIR /home/$BUILDBOT_USER
-
-RUN /usr/local/bin/virtualenv venv \
-    && . venv/bin/activate \
-    && pip install \
-       buildbot-worker \
-       pyflakes \
-       pyblake2 \
-       pyzmq \
-       requests \
-       twisted[tls]
-
-# Buildbot worker
-ARG BUILDBOT_WORKER_NAME=debian8-docker
-ARG BUILDBOT_WORKER_PASS=thisgetssetwhenpodisstarted
-ARG BUILDBOT_MASTER_HOST=dev-ci.z.cash
-ARG BUILDBOT_MASTER_PORT=9899
-
-WORKDIR /home/$BUILDBOT_USER
-RUN venv/bin/buildbot-worker create-worker $BUILDBOT_WORKER_NAME \
-      $BUILDBOT_MASTER_HOST:$BUILDBOT_MASTER_PORT \
-      $BUILDBOT_WORKER_NAME $BUILDBOT_WORKER_PASS \
-    && echo "OS: Debian 8" > $BUILDBOT_WORKER_NAME/info/host
-ADD buildbot.tac $BUILDBOT_WORKER_NAME/buildbot.tac
-
-WORKDIR /home/$BUILDBOT_USER/$BUILDBOT_WORKER_NAME
-CMD ["/usr/bin/dumb-init", "../venv/bin/twistd", "--pidfile=", "-ny", "buildbot.tac"]
--- a/bb-worker/Dockerfile.debian9
+++ b/bb-worker/Dockerfile.debian9
@ -1,62 +0,0 @@
-FROM debian:9
-ARG DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update \
-    && apt-get install -y \
-       build-essential \
-       autoconf \
-       cmake \
-       pkg-config \
-       curl \
-       git \
-       wget \
-       python-dev \
-       python-pip \
-       libtool \
-       lcov \
-       valgrind \
-       dumb-init \
-       bsdmainutils \
-       python-requests \
-    && pip install \
-       virtualenv \
-       pyblake2 \
-       pip
-
-# Buildbot user
-ARG BUILDBOT_USER=zcbbworker
-ARG BUILDBOT_UID=2001
-RUN useradd --home-dir /home/$BUILDBOT_USER \
-            --shell /bin/bash \
-            --create-home \
-            --uid $BUILDBOT_UID\
-            $BUILDBOT_USER
-
-USER $BUILDBOT_USER
-WORKDIR /home/$BUILDBOT_USER
-
-RUN /usr/local/bin/virtualenv venv \
-    && . venv/bin/activate \
-    && pip install \
-       buildbot-worker \
-       pyflakes \
-       pyblake2 \
-       pyzmq \
-       requests \
-       twisted[tls]
-
-# Buildbot worker
-ARG BUILDBOT_WORKER_NAME=debian8-docker
-ARG BUILDBOT_WORKER_PASS=thisgetssetwhenpodisstarted
-ARG BUILDBOT_MASTER_HOST=dev-ci.z.cash
-ARG BUILDBOT_MASTER_PORT=9899
-
-WORKDIR /home/$BUILDBOT_USER
-RUN venv/bin/buildbot-worker create-worker $BUILDBOT_WORKER_NAME \
-      $BUILDBOT_MASTER_HOST:$BUILDBOT_MASTER_PORT \
-      $BUILDBOT_WORKER_NAME $BUILDBOT_WORKER_PASS \
-    && echo "OS: Debian 9" > $BUILDBOT_WORKER_NAME/info/host
-ADD buildbot.tac $BUILDBOT_WORKER_NAME/buildbot.tac
-
-WORKDIR /home/$BUILDBOT_USER/$BUILDBOT_WORKER_NAME
-CMD ["/usr/bin/dumb-init", "../venv/bin/twistd", "--pidfile=", "-ny", "buildbot.tac"]
--- a/bb-worker/Dockerfile.ubuntu1604
+++ b/bb-worker/Dockerfile.ubuntu1604
@ -1,64 +0,0 @@
-FROM ubuntu:16.04
-ARG DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update \
-    && apt-get install -y \
-       build-essential \
-       autoconf \
-       cmake \
-       pkg-config \
-       curl \
-       git \
-       wget \
-       python-dev \
-       python-pip \
-       libtool \
-       lcov \
-       valgrind \
-       bsdmainutils \
-       python-requests \
-    && pip install \
-       virtualenv \
-       pyblake2 \
-       pip
-
-RUN wget -O /usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.2/dumb-init_1.2.2_amd64
-RUN chmod +x /usr/bin/dumb-init
-
-# Buildbot user
-ARG BUILDBOT_USER=zcbbworker
-ARG BUILDBOT_UID=2001
-RUN useradd --home-dir /home/$BUILDBOT_USER \
-            --shell /bin/bash \
-            --create-home \
-            --uid $BUILDBOT_UID\
-            $BUILDBOT_USER
-
-USER $BUILDBOT_USER
-WORKDIR /home/$BUILDBOT_USER
-
-RUN /usr/local/bin/virtualenv venv \
-    && . venv/bin/activate \
-    && pip install \
-       buildbot-worker \
-       pyflakes \
-       pyblake2 \
-       pyzmq \
-       requests \
-       twisted[tls]
-
-# Buildbot worker
-ARG BUILDBOT_WORKER_NAME=ubuntu16.04-docker
-ARG BUILDBOT_WORKER_PASS=thisgetssetwhenpodisstarted
-ARG BUILDBOT_MASTER_HOST=dev-ci.z.cash
-ARG BUILDBOT_MASTER_PORT=9899
-
-WORKDIR /home/$BUILDBOT_USER
-RUN venv/bin/buildbot-worker create-worker $BUILDBOT_WORKER_NAME \
-      $BUILDBOT_MASTER_HOST:$BUILDBOT_MASTER_PORT \
-      $BUILDBOT_WORKER_NAME $BUILDBOT_WORKER_PASS \
-    && echo "OS: Ubuntu 16.04" > $BUILDBOT_WORKER_NAME/info/host
-ADD buildbot.tac $BUILDBOT_WORKER_NAME/buildbot.tac
-
-WORKDIR /home/$BUILDBOT_USER/$BUILDBOT_WORKER_NAME
-CMD ["/usr/bin/dumb-init", "../venv/bin/twistd", "--pidfile=", "-ny", "buildbot.tac"]
--- a/bb-worker/Dockerfile.ubuntu1804
+++ b/bb-worker/Dockerfile.ubuntu1804
@ -1,62 +0,0 @@
-FROM ubuntu:18.04
-ARG DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update \
-    && apt-get install -y \
-       build-essential \
-       autoconf \
-       cmake \
-       pkg-config \
-       curl \
-       git \
-       wget \
-       python-dev \
-       python-pip \
-       libtool \
-       lcov \
-       valgrind \
-       dumb-init \
-       bsdmainutils \
-       python-requests \
-    && pip install \
-       virtualenv \
-       pyblake2 \
-       pip
-
-# Buildbot user
-ARG BUILDBOT_USER=zcbbworker
-ARG BUILDBOT_UID=2001
-RUN useradd --home-dir /home/$BUILDBOT_USER \
-            --shell /bin/bash \
-            --create-home \
-            --uid $BUILDBOT_UID\
-            $BUILDBOT_USER
-
-USER $BUILDBOT_USER
-WORKDIR /home/$BUILDBOT_USER
-
-RUN /usr/local/bin/virtualenv venv \
-    && . venv/bin/activate \
-    && pip install \
-       buildbot-worker \
-       pyflakes \
-       pyblake2 \
-       pyzmq \
-       requests \
-       twisted[tls]
-
-# Buildbot worker
-ARG BUILDBOT_WORKER_NAME=ubuntu18.04-docker
-ARG BUILDBOT_WORKER_PASS=thisgetssetwhenpodisstarted
-ARG BUILDBOT_MASTER_HOST=dev-ci.z.cash
-ARG BUILDBOT_MASTER_PORT=9899
-
-WORKDIR /home/$BUILDBOT_USER
-RUN venv/bin/buildbot-worker create-worker $BUILDBOT_WORKER_NAME \
-      $BUILDBOT_MASTER_HOST:$BUILDBOT_MASTER_PORT \
-      $BUILDBOT_WORKER_NAME $BUILDBOT_WORKER_PASS \
-    && echo "OS: Ubuntu 18.04" > $BUILDBOT_WORKER_NAME/info/host
-ADD buildbot.tac $BUILDBOT_WORKER_NAME/buildbot.tac
-
-WORKDIR /home/$BUILDBOT_USER/$BUILDBOT_WORKER_NAME
-CMD ["/usr/bin/dumb-init", "../venv/bin/twistd", "--pidfile=", "-ny", "buildbot.tac"]
--- a/bb-worker/Dockerfile.ubuntu1904
+++ b/bb-worker/Dockerfile.ubuntu1904
@ -1,62 +0,0 @@
-FROM ubuntu:19.04
-ARG DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update \
-    && apt-get install -y \
-       build-essential \
-       autoconf \
-       cmake \
-       pkg-config \
-       curl \
-       git \
-       wget \
-       python-dev \
-       python-pip \
-       libtool \
-       lcov \
-       valgrind \
-       dumb-init \
-       bsdmainutils \
-       python-requests \
-    && pip install \
-       virtualenv \
-       pyblake2 \
-       pip
-
-# Buildbot user
-ARG BUILDBOT_USER=zcbbworker
-ARG BUILDBOT_UID=2001
-RUN useradd --home-dir /home/$BUILDBOT_USER \
-            --shell /bin/bash \
-            --create-home \
-            --uid $BUILDBOT_UID\
-            $BUILDBOT_USER
-
-USER $BUILDBOT_USER
-WORKDIR /home/$BUILDBOT_USER
-
-RUN /usr/local/bin/virtualenv venv \
-    && . venv/bin/activate \
-    && pip install \
-       buildbot-worker \
-       pyflakes \
-       pyblake2 \
-       pyzmq \
-       requests \
-       twisted[tls]
-
-# Buildbot worker
-ARG BUILDBOT_WORKER_NAME=ubuntu19.04-docker
-ARG BUILDBOT_WORKER_PASS=thisgetssetwhenpodisstarted
-ARG BUILDBOT_MASTER_HOST=dev-ci.z.cash
-ARG BUILDBOT_MASTER_PORT=9899
-
-WORKDIR /home/$BUILDBOT_USER
-RUN venv/bin/buildbot-worker create-worker $BUILDBOT_WORKER_NAME \
-      $BUILDBOT_MASTER_HOST:$BUILDBOT_MASTER_PORT \
-      $BUILDBOT_WORKER_NAME $BUILDBOT_WORKER_PASS \
-    && echo "OS: Ubuntu 19.04" > $BUILDBOT_WORKER_NAME/info/host
-ADD buildbot.tac $BUILDBOT_WORKER_NAME/buildbot.tac
-
-WORKDIR /home/$BUILDBOT_USER/$BUILDBOT_WORKER_NAME
-CMD ["/usr/bin/dumb-init", "../venv/bin/twistd", "--pidfile=", "-ny", "buildbot.tac"]
--- a/bb-worker/cloudbuild-master.yaml
+++ b/bb-worker/cloudbuild-master.yaml
@ -1,40 +0,0 @@
-steps:
-  - name: 'gcr.io/cloud-builders/docker'
-    id: cacheLatest
-    entrypoint: 'bash'
-    args:
-     - '-c'
-     - |
-        ( docker pull gcr.io/zcash-web/bb-worker-debian8:latest || exit 0 );
-        ( docker pull gcr.io/zcash-web/bb-worker-debian9:latest || exit 0 );
-        ( docker pull gcr.io/zcash-web/bb-worker-debian10:latest || exit 0 );
-        ( docker pull gcr.io/zcash-web/bb-worker-ubuntu1604:latest || exit 0 );
-        ( docker pull gcr.io/zcash-web/bb-worker-ubuntu1804:latest || exit 0 );
-        ( docker pull gcr.io/zcash-web/bb-worker-ubuntu1904:latest || exit 0 );
-
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['build', '-f', 'bb-worker/Dockerfile.debian8', '--tag=gcr.io/zcash-web/bb-worker-debian8', 'bb-worker/', '--cache-from', 'gcr.io/zcash-web/bb-worker-debian8:latest']
-    waitFor: ['cacheLatest']
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['build', '-f', 'bb-worker/Dockerfile.debian9', '--tag=gcr.io/zcash-web/bb-worker-debian9', 'bb-worker/', '--cache-from', 'gcr.io/zcash-web/bb-worker-debian9:latest']
-    waitFor: ['cacheLatest']
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['build', '-f', 'bb-worker/Dockerfile.debian10', '--tag=gcr.io/zcash-web/bb-worker-debian10', 'bb-worker/', '--cache-from', 'gcr.io/zcash-web/bb-worker-debian10:latest']
-    waitFor: ['cacheLatest']
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['build', '-f', 'bb-worker/Dockerfile.ubuntu1604', '--tag=gcr.io/zcash-web/bb-worker-ubuntu1604', 'bb-worker/', '--cache-from', 'gcr.io/zcash-web/bb-worker-ubuntu1604:latest']
-    waitFor: ['cacheLatest']
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['build', '-f', 'bb-worker/Dockerfile.ubuntu1804', '--tag=gcr.io/zcash-web/bb-worker-ubuntu1804', 'bb-worker/', '--cache-from', 'gcr.io/zcash-web/bb-worker-ubuntu1804:latest']
-    waitFor: ['cacheLatest']
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['build', '-f', 'bb-worker/Dockerfile.ubuntu1904', '--tag=gcr.io/zcash-web/bb-worker-ubuntu1904', 'bb-worker/', '--cache-from', 'gcr.io/zcash-web/bb-worker-ubuntu1904:latest']
-    waitFor: ['cacheLatest']
-images:
-  - gcr.io/zcash-web/bb-worker-debian8
-  - gcr.io/zcash-web/bb-worker-debian9
-  - gcr.io/zcash-web/bb-worker-debian10
-  - gcr.io/zcash-web/bb-worker-ubuntu1604
-  - gcr.io/zcash-web/bb-worker-ubuntu1804
-  - gcr.io/zcash-web/bb-worker-ubuntu1904
-timeout: 1200s
--- a/bb-worker/cloudbuild.yaml
+++ b/bb-worker/cloudbuild.yaml
@ -1,33 +0,0 @@
-steps:
-  - name: 'gcr.io/cloud-builders/docker'
-    id: cacheLatest
-    entrypoint: 'bash'
-    args:
-     - '-c'
-     - |
-        ( docker pull gcr.io/zcash-web/bb-worker-debian8:latest || exit 0 );
-        ( docker pull gcr.io/zcash-web/bb-worker-debian9:latest || exit 0 );
-        ( docker pull gcr.io/zcash-web/bb-worker-debian10:latest || exit 0 );
-        ( docker pull gcr.io/zcash-web/bb-worker-ubuntu1604:latest || exit 0 );
-        ( docker pull gcr.io/zcash-web/bb-worker-ubuntu1804:latest || exit 0 );
-        ( docker pull gcr.io/zcash-web/bb-worker-ubuntu1904:latest || exit 0 );
-
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['build', '-f', 'bb-worker/Dockerfile.debian8', '--tag=gcr.io/zcash-web/bb-worker-debian8', 'bb-worker/', '--cache-from', 'gcr.io/zcash-web/bb-worker-debian8:latest']
-    waitFor: ['cacheLatest']
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['build', '-f', 'bb-worker/Dockerfile.debian9', '--tag=gcr.io/zcash-web/bb-worker-debian9', 'bb-worker/', '--cache-from', 'gcr.io/zcash-web/bb-worker-debian9:latest']
-    waitFor: ['cacheLatest']
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['build', '-f', 'bb-worker/Dockerfile.debian10', '--tag=gcr.io/zcash-web/bb-worker-debian10', 'bb-worker/', '--cache-from', 'gcr.io/zcash-web/bb-worker-debian10:latest']
-    waitFor: ['cacheLatest']
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['build', '-f', 'bb-worker/Dockerfile.ubuntu1604', '--tag=gcr.io/zcash-web/bb-worker-ubuntu1604', 'bb-worker/', '--cache-from', 'gcr.io/zcash-web/bb-worker-ubuntu1604:latest']
-    waitFor: ['cacheLatest']
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['build', '-f', 'bb-worker/Dockerfile.ubuntu1804', '--tag=gcr.io/zcash-web/bb-worker-ubuntu1804', 'bb-worker/', '--cache-from', 'gcr.io/zcash-web/bb-worker-ubuntu1804:latest']
-    waitFor: ['cacheLatest']
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['build', '-f', 'bb-worker/Dockerfile.ubuntu1904', '--tag=gcr.io/zcash-web/bb-worker-ubuntu1904', 'bb-worker/', '--cache-from', 'gcr.io/zcash-web/bb-worker-ubuntu1904:latest']
-    waitFor: ['cacheLatest']
-timeout: 1200s
--- a/cloudbuild-and-push.yml
+++ b/cloudbuild-and-push.yml
@ -0,0 +1,199 @@
+timeout: "2h30m0s"
+steps:
+  - name: 'gcr.io/cloud-builders/docker'
+    id: cacheLatest
+    entrypoint: 'bash'
+    args:
+     - '-c'
+     - |
+        ( docker pull gcr.io/zcash-web/bb-worker-debian8:latest || exit 0 );
+        ( docker pull gcr.io/zcash-web/bb-worker-debian9:latest || exit 0 );
+        ( docker pull gcr.io/zcash-web/bb-worker-debian10:latest || exit 0 );
+        ( docker pull gcr.io/zcash-web/bb-worker-ubuntu1604:latest || exit 0 );
+        ( docker pull gcr.io/zcash-web/bb-worker-ubuntu1804:latest || exit 0 );
+        ( docker pull gcr.io/zcash-web/bb-worker-ubuntu1904:latest || exit 0 );
+        ( docker pull gcr.io/zcash-web/bb-worker-centos8:latest || exit 0 );
+        ( docker pull gcr.io/zcash-web/bb-worker-arch:python3 || exit 0 );
+
+# Debian 8
+  - name: 'gcr.io/cloud-builders/docker'
+    args: 
+      - build
+      - -f
+      - bb-worker/Dockerfile.debian8-build-python3.7
+      - --tag=gcr.io/zcash-web/bb-worker-debian8-build-python:3.7
+      - bb-worker/
+    id: debian8-build-python
+    wait_for: ['cacheLatest']
+  - name: 'gcr.io/cloud-builders/docker'
+    args: 
+      - build
+      - -f
+      - bb-worker/Dockerfile.apt-dumb-init.python3.7
+      - --tag=gcr.io/zcash-web/bb-worker-debian8:latest
+      - --tag=gcr.io/zcash-web/bb-worker-debian8:python3.7      
+      - --build-arg=FROMBASEOS=debian8
+      - --build-arg=BASEOS=debian8
+      - bb-worker/
+    wait_for: ['debian8-build-python']
+
+# Debian 9
+  - name: 'gcr.io/cloud-builders/docker'
+    args: 
+      - build
+      - -f
+      - bb-worker/Dockerfile.apt-build-python3.7
+      - --tag=gcr.io/zcash-web/bb-worker-debian9-build-python:3.7
+      - --build-arg=BASEOS=debian:9
+      - bb-worker/
+    id: debian9-build-python
+    wait_for: ['cacheLatest']
+  - name: 'gcr.io/cloud-builders/docker'
+    args: 
+      - build
+      - -f
+      - bb-worker/Dockerfile.apt.python3.7
+      - --tag=gcr.io/zcash-web/bb-worker-debian9:python3.7
+      - --tag=gcr.io/zcash-web/bb-worker-debian9:latest
+      - --build-arg=FROMBASEOS=debian9
+      - --build-arg=BASEOS=debian9
+      - bb-worker/
+    wait_for: ['debian9-build-python']
+
+# Debian 10
+  - name: 'gcr.io/cloud-builders/docker'
+    args: 
+      - build
+      - -f
+      - bb-worker/Dockerfile.apt-build-python3.7
+      - --tag=gcr.io/zcash-web/bb-worker-debian10-build-python:3.7
+      - --build-arg=BASEOS=debian:10
+      - bb-worker/
+    id: debian10-build-python
+    wait_for: ['cacheLatest']
+  - name: 'gcr.io/cloud-builders/docker'
+    args: 
+      - build
+      - -f
+      - bb-worker/Dockerfile.apt.python3.7
+      - --tag=gcr.io/zcash-web/bb-worker-debian10:python3.7
+      - --tag=gcr.io/zcash-web/bb-worker-debian10:latest
+      - --build-arg=FROMBASEOS=debian10
+      - --build-arg=BASEOS=debian10
+      - bb-worker/
+    wait_for: ['debian10-build-python']
+
+# Ubuntu 16.04
+  - name: 'gcr.io/cloud-builders/docker'
+    timeout: "2h"
+    args: 
+      - build
+      - -f
+      - bb-worker/Dockerfile.apt-build-python3.7
+      - --tag=gcr.io/zcash-web/bb-worker-ubuntu1604-build-python:3.7
+      - --build-arg=BASEOS=ubuntu:16.04
+      - bb-worker/
+    id: ubuntu1604-build-python
+    wait_for: ['cacheLatest']
+  - name: 'gcr.io/cloud-builders/docker'
+    args: 
+      - build
+      - -f
+      - bb-worker/Dockerfile.apt-dumb-init.python3.7
+      - --tag=gcr.io/zcash-web/bb-worker-ubuntu1604:python3.7
+      - --tag=gcr.io/zcash-web/bb-worker-ubuntu1604:latest
+      - --build-arg=FROMBASEOS=ubuntu1604
+      - --build-arg=BASEOS=ubuntu1604
+      - bb-worker/
+    wait_for: ['ubuntu1604-build-python']
+
+# Ubuntu 18.04
+  - name: 'gcr.io/cloud-builders/docker'
+    args: 
+      - build
+      - -f
+      - bb-worker/Dockerfile.apt-build-python3.7
+      - --tag=gcr.io/zcash-web/bb-worker-ubuntu1804-build-python:3.7
+      - --build-arg=BASEOS=ubuntu:18.04
+      - bb-worker/
+    id: ubuntu1804-build-python
+    wait_for: ['cacheLatest']
+  - name: 'gcr.io/cloud-builders/docker'
+    args: 
+      - build
+      - -f
+      - bb-worker/Dockerfile.apt.python3.7
+      - --tag=gcr.io/zcash-web/bb-worker-ubuntu1804:python3.7
+      - --tag=gcr.io/zcash-web/bb-worker-ubuntu1804:latest
+      - --build-arg=FROMBASEOS=ubuntu1804
+      - --build-arg=BASEOS=ubuntu1804
+      - bb-worker/
+    wait_for: ['ubuntu1804-build-python']
+
+# Ubuntu 19.04
+  - name: 'gcr.io/cloud-builders/docker'
+    args: 
+      - build
+      - -f
+      - bb-worker/Dockerfile.apt-build-python3.7
+      - --tag=gcr.io/zcash-web/bb-worker-ubuntu1904-build-python:3.7
+      - --build-arg=BASEOS=ubuntu:19.04
+      - bb-worker/
+    id: ubuntu1904-build-python
+    wait_for: ['cacheLatest']
+  - name: 'gcr.io/cloud-builders/docker'
+    args: 
+      - build
+      - -f
+      - bb-worker/Dockerfile.apt.python3.7
+      - --tag=gcr.io/zcash-web/bb-worker-ubuntu1904:python3.7
+      - --tag=gcr.io/zcash-web/bb-worker-ubuntu1904:latest
+      - --build-arg=FROMBASEOS=ubuntu1904
+      - --build-arg=BASEOS=ubuntu1904
+      - bb-worker/
+    wait_for: ['ubuntu1904-build-python']
+
+# Centos8
+  - name: 'gcr.io/cloud-builders/docker'
+    args: 
+      - build
+      - -f
+      - bb-worker/Dockerfile.centos8
+      - --tag=gcr.io/zcash-web/bb-worker-centos8:python3
+      - --tag=gcr.io/zcash-web/bb-worker-centos8:latest
+      - bb-worker/
+    wait_for: ['cacheLatest']
+
+# Arch
+  - name: 'gcr.io/cloud-builders/docker'
+    args: 
+      - build
+      - -f
+      - bb-worker/Dockerfile.arch
+      - --tag=gcr.io/zcash-web/bb-worker-arch:python3
+      - --tag=gcr.io/zcash-web/bb-worker-arch:latest
+      - bb-worker/
+    wait_for: ['cacheLatest']    
+images:
+  - gcr.io/zcash-web/bb-worker-debian8-build-python:3.7
+  - gcr.io/zcash-web/bb-worker-debian8:latest
+  - gcr.io/zcash-web/bb-worker-debian8:python3.7
+  - gcr.io/zcash-web/bb-worker-debian9-build-python:3.7
+  - gcr.io/zcash-web/bb-worker-debian9:latest
+  - gcr.io/zcash-web/bb-worker-debian9:python3.7
+  - gcr.io/zcash-web/bb-worker-debian10-build-python:3.7
+  - gcr.io/zcash-web/bb-worker-debian10:latest
+  - gcr.io/zcash-web/bb-worker-debian10:python3.7
+  - gcr.io/zcash-web/bb-worker-ubuntu1604-build-python:3.7
+  - gcr.io/zcash-web/bb-worker-ubuntu1604:latest
+  - gcr.io/zcash-web/bb-worker-ubuntu1604:python3.7
+  - gcr.io/zcash-web/bb-worker-ubuntu1804-build-python:3.7
+  - gcr.io/zcash-web/bb-worker-ubuntu1804:latest
+  - gcr.io/zcash-web/bb-worker-ubuntu1804:python3.7
+  - gcr.io/zcash-web/bb-worker-ubuntu1904-build-python:3.7
+  - gcr.io/zcash-web/bb-worker-ubuntu1904:latest
+  - gcr.io/zcash-web/bb-worker-ubuntu1904:python3.7
+  - gcr.io/zcash-web/bb-worker-centos8:python3
+  - gcr.io/zcash-web/bb-worker-centos8:latest
+  - gcr.io/zcash-web/bb-worker-arch:python3
+  - gcr.io/zcash-web/bb-worker-arch:latest
--- a/cloudbuild.yml
+++ b/cloudbuild.yml
@ -173,27 +173,4 @@ steps:
      - --tag=gcr.io/zcash-web/bb-worker-arch:python3
      - --tag=gcr.io/zcash-web/bb-worker-arch:latest
      - bb-worker/
-    wait_for: ['cacheLatest']    
-images:
-  - gcr.io/zcash-web/bb-worker-debian8-build-python:3.7
-  - gcr.io/zcash-web/bb-worker-debian8:latest
-  - gcr.io/zcash-web/bb-worker-debian8:python3.7
-  - gcr.io/zcash-web/bb-worker-debian9-build-python:3.7
-  - gcr.io/zcash-web/bb-worker-debian9:latest
-  - gcr.io/zcash-web/bb-worker-debian9:python3.7
-  - gcr.io/zcash-web/bb-worker-debian10-build-python:3.7
-  - gcr.io/zcash-web/bb-worker-debian10:latest
-  - gcr.io/zcash-web/bb-worker-debian10:python3.7
-  - gcr.io/zcash-web/bb-worker-ubuntu1604-build-python:3.7
-  - gcr.io/zcash-web/bb-worker-ubuntu1604:latest
-  - gcr.io/zcash-web/bb-worker-ubuntu1604:python3.7
-  - gcr.io/zcash-web/bb-worker-ubuntu1804-build-python:3.7
-  - gcr.io/zcash-web/bb-worker-ubuntu1804:latest
-  - gcr.io/zcash-web/bb-worker-ubuntu1804:python3.7
-  - gcr.io/zcash-web/bb-worker-ubuntu1904-build-python:3.7
-  - gcr.io/zcash-web/bb-worker-ubuntu1904:latest
-  - gcr.io/zcash-web/bb-worker-ubuntu1904:python3.7
-  - gcr.io/zcash-web/bb-worker-centos8:python3
-  - gcr.io/zcash-web/bb-worker-centos8:latest
-  - gcr.io/zcash-web/bb-worker-arch:python3
-  - gcr.io/zcash-web/bb-worker-arch:latest
+    wait_for: ['cacheLatest']