From 43bfe517961f5bc5d2dfc55fb420052c8757f8f6 Mon Sep 17 00:00:00 2001 From: xing-yang Date: Fri, 7 Jan 2022 16:02:23 +0000 Subject: [PATCH] Squashed 'release-tools/' changes from a6a1a797..4aedf357 4aedf357 Merge pull request #178 from xing-yang/timeout 2b9897eb Increase build timeout 51d37029 Merge pull request #177 from mauriciopoppe/kind-image-1.23 a30efeac Add kind image for 1.23 git-subtree-dir: release-tools git-subtree-split: 4aedf357cac90c044cf3c2b8ff189520e3fd37b2 --- cloudbuild.yaml | 5 ++--- prow.sh | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index f36f265f..4bcffad3 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -16,9 +16,8 @@ # To promote release images, see https://github.com/kubernetes/k8s.io/tree/HEAD/k8s.gcr.io/images/k8s-staging-sig-storage. # This must be specified in seconds. If omitted, defaults to 600s (10 mins). -# Building three images in external-snapshotter takes roughly half an hour, -# sometimes more. -timeout: 3600s +# Building three images in external-snapshotter takes more than an hour. +timeout: 7200s # This prevents errors if you don't use both _GIT_TAG and _PULL_BASE_REF, # or any new substitutions added in the future. options: diff --git a/prow.sh b/prow.sh index ac8d8b0c..81db64ec 100755 --- a/prow.sh +++ b/prow.sh @@ -149,7 +149,8 @@ configvar CSI_PROW_KIND_VERSION "$(kind_version_default)" "kind" # kind images to use. Must match the kind version. # The release notes of each kind release list the supported images. -configvar CSI_PROW_KIND_IMAGES "kindest/node:v1.22.0@sha256:b8bda84bb3a190e6e028b1760d277454a72267a5454b57db34437c34a588d047 +configvar CSI_PROW_KIND_IMAGES "kindest/node:v1.23.0@sha256:49824ab1727c04e56a21a5d8372a402fcd32ea51ac96a2706a12af38934f81ac +kindest/node:v1.22.0@sha256:b8bda84bb3a190e6e028b1760d277454a72267a5454b57db34437c34a588d047 kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6 kindest/node:v1.20.7@sha256:cbeaf907fc78ac97ce7b625e4bf0de16e3ea725daf6b04f930bd14c67c671ff9 kindest/node:v1.19.11@sha256:07db187ae84b4b7de440a73886f008cf903fcf5764ba8106a9fd5243d6f32729