fix broken GA CI build (#10453)

Makefile

@@ -916,6 +916,10 @@ HELM_BUCKET ?= gs://solo-public-tagged-helm
 # modifier to docker builds which can auto-delete docker images after a set time
 QUAY_EXPIRATION_LABEL ?= --label quay.expires-after=3w
 
+ifeq (,$(findstring quay,$(IMAGE_REGISTRY)))
+	QUAY_EXPIRATION_LABEL :=
+endif
+
 # define empty publish targets so calls won't fail
 .PHONY: publish-docker
 .PHONY: publish-docker-retag

changelog/v1.19.0-beta1/ci-multiarch-fixes.yaml

@@ -0,0 +1,7 @@
+changelog:
+  - type: NON_USER_FACING
+    description: >-
+      Build & push multiarch images tocGCS besides quay instead of retagging them in CI build.
+      Also enabled publishing images to GCR for dev build so we can catch errors before running GA build.
+
+      skipCI-docs-build:true

ci/cloudbuild/publish-artifacts.yaml

@@ -100,14 +100,15 @@ steps:
   waitFor:
   - 'gcr-auth'
 
-# Run make targets to retag and push docker images to GCR
+# Run make targets to build and push docker images to GCR
 - name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.2'
-  id: 'docker-push-extended-gcr'
+  id: 'publish-docker-extended-gcr'
   dir: *dir
   args:
-  - 'publish-docker-retag'
+  - publish-docker
   env:
-  - 'ORIGINAL_IMAGE_REGISTRY=quay.io/solo-io'
+  - 'MULTIARCH=true'
+  - 'MULTIARCH_PUSH=true'
   - 'IMAGE_REGISTRY=gcr.io/gloo-edge'
   secretEnv:
   - 'GITHUB_TOKEN'