From 7e752dfb75e69264449feaec1c46e881ae60d2fa Mon Sep 17 00:00:00 2001 From: fengzixu Date: Mon, 4 Jan 2021 16:26:24 +0900 Subject: [PATCH] Squashed 'release-tools/' changes from c6a88c6e..2bb75253 2bb75253 Merge pull request #117 from fengzixu/master 3b6d17b1 Merge pull request #118 from pohly/cloud-build-timeout 9318c6cc cloud build: double the timeout, now 1 hour 4ab8b154 use the tag to replace commit of csi-test 5d74e455 change the csi-test import path to v4 7dcd0a99 upgrade csi-test to v4.0.2 86ff5802 Merge pull request #116 from andyzhangx/export-image-name c3a96625 allow export image name and registry name git-subtree-dir: release-tools git-subtree-split: 2bb7525377997515b7ef28b44e0a82c790844f1e --- build.make | 2 +- cloudbuild.yaml | 4 +++- prow.sh | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build.make b/build.make index 516dc12d7..ca2be670a 100644 --- a/build.make +++ b/build.make @@ -20,7 +20,7 @@ # This is the default. It can be overridden in the main Makefile after # including build.make. -REGISTRY_NAME=quay.io/k8scsi +REGISTRY_NAME?=quay.io/k8scsi # Can be set to -mod=vendor to ensure that the "vendor" directory is used. GOFLAGS_VENDOR= diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 8f678924e..7f0a4341c 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -16,7 +16,9 @@ # To promote release images, see https://github.com/kubernetes/k8s.io/tree/master/k8s.gcr.io/images/k8s-staging-sig-storage. # This must be specified in seconds. If omitted, defaults to 600s (10 mins). -timeout: 1800s +# Building three images in external-snapshotter takes roughly half an hour, +# sometimes more. +timeout: 3600s # 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 44511fb23..161f347f6 100755 --- a/prow.sh +++ b/prow.sh @@ -227,8 +227,8 @@ configvar CSI_PROW_E2E_IMPORT_PATH "k8s.io/kubernetes" "E2E package" # of the cluster. The alternative would have been to (cross-)compile csi-sanity # and install it inside the cluster, which is not necessarily easier. configvar CSI_PROW_SANITY_REPO https://github.com/kubernetes-csi/csi-test "csi-test repo" -configvar CSI_PROW_SANITY_VERSION 5421d9f3c37be3b95b241b44a094a3db11bee789 "csi-test version" # latest master -configvar CSI_PROW_SANITY_IMPORT_PATH github.com/kubernetes-csi/csi-test "csi-test package" +configvar CSI_PROW_SANITY_VERSION v4.0.2 "csi-test version" # v4.0.2 +configvar CSI_PROW_SANITY_IMPORT_PATH github.com/kubernetes-csi/csi-test/v4 "csi-test package" configvar CSI_PROW_SANITY_SERVICE "hostpath-service" "Kubernetes TCP service name that exposes csi.sock" configvar CSI_PROW_SANITY_POD "csi-hostpathplugin-0" "Kubernetes pod with CSI driver" configvar CSI_PROW_SANITY_CONTAINER "hostpath" "Kubernetes container with CSI driver"