From 43d72f37d187ffee80f4072b70c03c00af4c6d1c Mon Sep 17 00:00:00 2001
From: Guillermo Gaston <guillermogastonlorente@gmail.com>
Date: Tue, 21 Nov 2023 11:06:46 -0600
Subject: [PATCH] =?UTF-8?q?Revert=20"=F0=9F=8C=B1=20Improve=20release=20st?=
 =?UTF-8?q?aging=20build=20speed"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Makefile b/Makefile
index 05a736541de5..e4a37e37a03c 100644
--- a/Makefile
+++ b/Makefile
@@ -979,9 +979,7 @@ release-binary: $(RELEASE_DIR)
 
 .PHONY: release-staging
 release-staging: ## Build and push container images to the staging bucket
-	REGISTRY=$(STAGING_REGISTRY) $(MAKE) docker-build-all
-	REGISTRY=$(STAGING_REGISTRY) $(MAKE) docker-push-all
-	REGISTRY=$(STAGING_REGISTRY) $(MAKE) release-alias-tag
+	REGISTRY=$(STAGING_REGISTRY) $(MAKE) docker-build-all docker-push-all release-alias-tag
 
 .PHONY: release-staging-nightly
 release-staging-nightly: ## Tag and push container images to the staging bucket. Example image tag: cluster-api-controller:nightly_main_20210121
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 62301d08b9ec..ccbbdee4b278 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -12,9 +12,10 @@ steps:
     - TAG=$_GIT_TAG
     - PULL_BASE_REF=$_PULL_BASE_REF
     - DOCKER_BUILDKIT=1
-    args: ['release-staging', '-j', '8', '-O']
+    args:
+    - release-staging
 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
   _GIT_TAG: '12345'
-  _PULL_BASE_REF: 'dev'
\ No newline at end of file
+  _PULL_BASE_REF: 'dev'