From 9328e0a6386bdaa7fe078fbd093ca0ca761c1429 Mon Sep 17 00:00:00 2001
From: Markus Lehtonen <markus.lehtonen@intel.com>
Date: Fri, 21 Jan 2022 10:39:47 +0200
Subject: [PATCH] cloudbuild.yaml: increase timeout to 25 minutes

Multiarch builds take considerably longer than the default (10 min)
allows.

(sync with commit e67463159114ff5113e51864a4c9318765eebdc5)
---
 cloudbuild.yaml                | 1 +
 scripts/test-infra/test-e2e.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 03ad1e492..9b244ae67 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -1,3 +1,4 @@
+timeout: 1500s
 steps:
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20211118-2f2d816b90
     entrypoint: scripts/test-infra/push-image.sh
diff --git a/scripts/test-infra/test-e2e.sh b/scripts/test-infra/test-e2e.sh
index 344023052..f4ef31383 100755
--- a/scripts/test-infra/test-e2e.sh
+++ b/scripts/test-infra/test-e2e.sh
@@ -19,7 +19,7 @@ i=1
 while true; do
     if make poll-images; then
         break
-    elif [ $i -ge 12 ]; then
+    elif [ $i -ge 27 ]; then
         echo "ERROR: too many tries when polling for image"
         exit 1
     fi