Merge pull request #9763 from k8s-infra-cherrypick-robot/cherry-pick-…

…9753-to-release-1.4 [release-1.4] 🌱 Revert "Improve release staging build speed"
kubernetes-sigs · Nov 22, 2023 · ae0ae3e · ae0ae3e
2 parents 6e5d950 + 43d72f3
commit ae0ae3e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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'
+  _PULL_BASE_REF: 'dev'