From 1a37c0800e8c4b451caed7e70106e5d407ac0ec1 Mon Sep 17 00:00:00 2001
From: Amir Alavi <amiralavi7@gmail.com>
Date: Wed, 21 Dec 2022 23:09:33 -0500
Subject: [PATCH] Revert "parallelize docker build for each arch"

---
 Makefile        |  4 +---
 cloudbuild.yaml | 43 ++-----------------------------------------
 2 files changed, 3 insertions(+), 44 deletions(-)

diff --git a/Makefile b/Makefile
index f28d16793..f620b23d5 100644
--- a/Makefile
+++ b/Makefile
@@ -84,7 +84,7 @@ push: image
 	$(CONTAINER_ENGINE) tag $(IMAGE) $(IMAGE_GCLOUD)
 	$(CONTAINER_ENGINE) push $(IMAGE_GCLOUD)
 
-push-images:
+push-all: image.amd64 image.arm image.arm64
 	gcloud auth configure-docker
 	for arch in $(ARCHS); do \
 		$(CONTAINER_ENGINE) tag $(IMAGE)-$${arch} $(IMAGE_GCLOUD)-$${arch} ;\
@@ -96,8 +96,6 @@ push-images:
 	done
 	DOCKER_CLI_EXPERIMENTAL=enabled $(CONTAINER_ENGINE) manifest push $(IMAGE_GCLOUD) ;\
 
-push-all: image.amd64 image.arm image.arm64 push-images
-
 clean:
 	rm -rf _output
 	rm -rf _tmp
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index c5aa7e036..24ee72106 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -7,53 +7,14 @@ timeout: 3600s
 options:
   substitution_option: ALLOW_LOOSE
 steps:
-  - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20221007-ad65926f6b'
-    id: image-amd64
+  - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20211118-2f2d816b90'
     entrypoint: make
     env:
     - DOCKER_CLI_EXPERIMENTAL=enabled
     - VERSION=$_GIT_TAG
     - BASE_REF=$_PULL_BASE_REF
     args:
-    - image.amd64
-    waitFor: ['-']  # run in parallel
-
-  - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20221007-ad65926f6b'
-    id: image-arm
-    entrypoint: make
-    env:
-    - DOCKER_CLI_EXPERIMENTAL=enabled
-    - VERSION=$_GIT_TAG
-    - BASE_REF=$_PULL_BASE_REF
-    args:
-    - image.arm
-    waitFor: ['-']
-
-  - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20221007-ad65926f6b'
-    id: image-arm64
-    entrypoint: make
-    env:
-    - DOCKER_CLI_EXPERIMENTAL=enabled
-    - VERSION=$_GIT_TAG
-    - BASE_REF=$_PULL_BASE_REF
-    args:
-    - image.arm64
-    waitFor: ['-']
-
-  - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20221007-ad65926f6b'
-    entrypoint: make
-    env:
-    - DOCKER_CLI_EXPERIMENTAL=enabled
-    - VERSION=$_GIT_TAG
-    - BASE_REF=$_PULL_BASE_REF
-    args:
-    - push-images
-    waitFor:
-    - image-amd64
-    - image-arm
-    - image-arm64
-
-
+    - push-all
 substitutions:
   # _GIT_TAG will be filled with a git-based tag for the image, of the form vYYYYMMDD-hash, and
   # can be used as a substitution