From 2431de42556cfeb9f76c66b745ff753f1f7bea7e Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Fri, 1 May 2020 03:07:50 -0400 Subject: [PATCH] build: Split out building for debian-{base,iptables} and pause images - Eliminates a failure in one image build from prevent the others - Allows subdir approvers ownership over individual builds - Makes cleanup a little easier if one or more of these images go away Signed-off-by: Stephen Augustus --- build/cloudbuild.yaml | 39 --------------------------- build/debian-base/cloudbuild.yaml | 15 +++++++++++ build/debian-iptables/cloudbuild.yaml | 15 +++++++++++ build/pause/cloudbuild.yaml | 19 +++++++++++++ 4 files changed, 49 insertions(+), 39 deletions(-) delete mode 100644 build/cloudbuild.yaml create mode 100644 build/debian-base/cloudbuild.yaml create mode 100644 build/debian-iptables/cloudbuild.yaml create mode 100644 build/pause/cloudbuild.yaml diff --git a/build/cloudbuild.yaml b/build/cloudbuild.yaml deleted file mode 100644 index dd1348c7752..00000000000 --- a/build/cloudbuild.yaml +++ /dev/null @@ -1,39 +0,0 @@ -# See https://cloud.google.com/cloud-build/docs/build-config -timeout: 1200s -options: - substitution_option: ALLOW_LOOSE - machineType: 'N1_HIGHCPU_8' -steps: - - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20200422-b25d964' - entrypoint: make - dir: ./build/debian-base - env: - - DOCKER_CLI_EXPERIMENTAL=enabled - - REGISTRY=gcr.io/$PROJECT_ID - - IMAGE=gcr.io/$PROJECT_ID/debian-base - - BUILD_IMAGE=debian-build - args: - - all-push - - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20200422-b25d964' - entrypoint: make - dir: ./build/debian-iptables - env: - - DOCKER_CLI_EXPERIMENTAL=enabled - - REGISTRY=gcr.io/$PROJECT_ID - - BASE_REGISTRY=gcr.io/$PROJECT_ID - - IMAGE=gcr.io/$PROJECT_ID/debian-iptables - args: - - all-push - - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20200422-b25d964' - entrypoint: 'bash' - dir: ./build/pause - env: - - DOCKER_CLI_EXPERIMENTAL=enabled - - REGISTRY=gcr.io/$PROJECT_ID - - IMAGE=gcr.io/$PROJECT_ID/pause - - HOME=/root - args: - - '-c' - - | - gcloud auth configure-docker \ - && make all-push diff --git a/build/debian-base/cloudbuild.yaml b/build/debian-base/cloudbuild.yaml new file mode 100644 index 00000000000..87181af413b --- /dev/null +++ b/build/debian-base/cloudbuild.yaml @@ -0,0 +1,15 @@ +# See https://cloud.google.com/cloud-build/docs/build-config +timeout: 1200s +options: + substitution_option: ALLOW_LOOSE + machineType: 'N1_HIGHCPU_8' +steps: + - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20200422-b25d964' + entrypoint: make + env: + - DOCKER_CLI_EXPERIMENTAL=enabled + - REGISTRY=gcr.io/$PROJECT_ID + - IMAGE=gcr.io/$PROJECT_ID/debian-base + - BUILD_IMAGE=debian-build + args: + - all-push diff --git a/build/debian-iptables/cloudbuild.yaml b/build/debian-iptables/cloudbuild.yaml new file mode 100644 index 00000000000..670edd9feb4 --- /dev/null +++ b/build/debian-iptables/cloudbuild.yaml @@ -0,0 +1,15 @@ +# See https://cloud.google.com/cloud-build/docs/build-config +timeout: 1200s +options: + substitution_option: ALLOW_LOOSE + machineType: 'N1_HIGHCPU_8' +steps: + - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20200422-b25d964' + entrypoint: make + env: + - DOCKER_CLI_EXPERIMENTAL=enabled + - REGISTRY=gcr.io/$PROJECT_ID + - BASE_REGISTRY=gcr.io/$PROJECT_ID + - IMAGE=gcr.io/$PROJECT_ID/debian-iptables + args: + - all-push diff --git a/build/pause/cloudbuild.yaml b/build/pause/cloudbuild.yaml new file mode 100644 index 00000000000..6c83082b4f2 --- /dev/null +++ b/build/pause/cloudbuild.yaml @@ -0,0 +1,19 @@ +# See https://cloud.google.com/cloud-build/docs/build-config +timeout: 1200s +options: + substitution_option: ALLOW_LOOSE + machineType: 'N1_HIGHCPU_8' +steps: + - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20200422-b25d964' + entrypoint: 'bash' + dir: ./build/pause + env: + - DOCKER_CLI_EXPERIMENTAL=enabled + - REGISTRY=gcr.io/$PROJECT_ID + - IMAGE=gcr.io/$PROJECT_ID/pause + - HOME=/root + args: + - '-c' + - | + gcloud auth configure-docker \ + && make all-push