Cloud Build: Fix substitutions. (#11759)

Prow hands in some substitutions via arguments we need to ignore. Co-authored-by: Marco Ebert <[email protected]>
kubernetes · Aug 11, 2024 · f76e9be · f76e9be
1 parent ce37042
commit f76e9be
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 2 deletions.
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
@@ -1,5 +1,6 @@
-substitutions:
-  _PULL_BASE_SHA: "12345"
+options:
+  # Ignore Prow provided substitutions.
+  substitution_option: ALLOW_LOOSE
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
     env:

diff --git a/images/cfssl/cloudbuild.yaml b/images/cfssl/cloudbuild.yaml
@@ -1,3 +1,6 @@
+options:
+  # Ignore Prow provided substitutions.
+  substitution_option: ALLOW_LOOSE
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
     env:

diff --git a/images/custom-error-pages/cloudbuild.yaml b/images/custom-error-pages/cloudbuild.yaml
@@ -1,3 +1,6 @@
+options:
+  # Ignore Prow provided substitutions.
+  substitution_option: ALLOW_LOOSE
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
     env:

diff --git a/images/ext-auth-example-authsvc/cloudbuild.yaml b/images/ext-auth-example-authsvc/cloudbuild.yaml
@@ -1,3 +1,6 @@
+options:
+  # Ignore Prow provided substitutions.
+  substitution_option: ALLOW_LOOSE
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
     env:

diff --git a/images/fastcgi-helloserver/cloudbuild.yaml b/images/fastcgi-helloserver/cloudbuild.yaml
@@ -1,3 +1,6 @@
+options:
+  # Ignore Prow provided substitutions.
+  substitution_option: ALLOW_LOOSE
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
     env:

diff --git a/images/go-grpc-greeter-server/cloudbuild.yaml b/images/go-grpc-greeter-server/cloudbuild.yaml
@@ -1,3 +1,6 @@
+options:
+  # Ignore Prow provided substitutions.
+  substitution_option: ALLOW_LOOSE
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
     env:

diff --git a/images/httpbun/cloudbuild.yaml b/images/httpbun/cloudbuild.yaml
@@ -1,3 +1,6 @@
+options:
+  # Ignore Prow provided substitutions.
+  substitution_option: ALLOW_LOOSE
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
     env:

diff --git a/images/kube-webhook-certgen/cloudbuild.yaml b/images/kube-webhook-certgen/cloudbuild.yaml
@@ -1,3 +1,6 @@
+options:
+  # Ignore Prow provided substitutions.
+  substitution_option: ALLOW_LOOSE
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
     env:

diff --git a/images/nginx-1.25/cloudbuild.yaml b/images/nginx-1.25/cloudbuild.yaml
@@ -1,6 +1,8 @@
 options:
   # Increase machine type for multi-arch builds.
   machineType: E2_HIGHCPU_32
+  # Ignore Prow provided substitutions.
+  substitution_option: ALLOW_LOOSE
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
     env:

diff --git a/images/nginx/cloudbuild.yaml b/images/nginx/cloudbuild.yaml
@@ -1,6 +1,8 @@
 options:
   # Increase machine type for multi-arch builds.
   machineType: E2_HIGHCPU_32
+  # Ignore Prow provided substitutions.
+  substitution_option: ALLOW_LOOSE
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
     env:

diff --git a/images/opentelemetry/cloudbuild.yaml b/images/opentelemetry/cloudbuild.yaml
@@ -1,6 +1,8 @@
 options:
   # Increase machine type for multi-arch builds.
   machineType: E2_HIGHCPU_8
+  # Ignore Prow provided substitutions.
+  substitution_option: ALLOW_LOOSE
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
     env:

diff --git a/images/test-runner/cloudbuild.yaml b/images/test-runner/cloudbuild.yaml
@@ -1,3 +1,6 @@
+options:
+  # Ignore Prow provided substitutions.
+  substitution_option: ALLOW_LOOSE
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240523-a15ad90fc9
     env: