Skip to content

Commit 7e752df

Browse files
committed
Squashed 'release-tools/' changes from c6a88c6..2bb7525
2bb7525 Merge pull request kubernetes-csi#117 from fengzixu/master 3b6d17b Merge pull request kubernetes-csi#118 from pohly/cloud-build-timeout 9318c6c cloud build: double the timeout, now 1 hour 4ab8b15 use the tag to replace commit of csi-test 5d74e45 change the csi-test import path to v4 7dcd0a9 upgrade csi-test to v4.0.2 86ff580 Merge pull request kubernetes-csi#116 from andyzhangx/export-image-name c3a9662 allow export image name and registry name git-subtree-dir: release-tools git-subtree-split: 2bb7525
1 parent 54ce7b2 commit 7e752df

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

build.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
# This is the default. It can be overridden in the main Makefile after
2222
# including build.make.
23-
REGISTRY_NAME=quay.io/k8scsi
23+
REGISTRY_NAME?=quay.io/k8scsi
2424

2525
# Can be set to -mod=vendor to ensure that the "vendor" directory is used.
2626
GOFLAGS_VENDOR=

cloudbuild.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
# To promote release images, see https://github.com/kubernetes/k8s.io/tree/master/k8s.gcr.io/images/k8s-staging-sig-storage.
1717

1818
# This must be specified in seconds. If omitted, defaults to 600s (10 mins).
19-
timeout: 1800s
19+
# Building three images in external-snapshotter takes roughly half an hour,
20+
# sometimes more.
21+
timeout: 3600s
2022
# This prevents errors if you don't use both _GIT_TAG and _PULL_BASE_REF,
2123
# or any new substitutions added in the future.
2224
options:

prow.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,8 @@ configvar CSI_PROW_E2E_IMPORT_PATH "k8s.io/kubernetes" "E2E package"
227227
# of the cluster. The alternative would have been to (cross-)compile csi-sanity
228228
# and install it inside the cluster, which is not necessarily easier.
229229
configvar CSI_PROW_SANITY_REPO https://github.com/kubernetes-csi/csi-test "csi-test repo"
230-
configvar CSI_PROW_SANITY_VERSION 5421d9f3c37be3b95b241b44a094a3db11bee789 "csi-test version" # latest master
231-
configvar CSI_PROW_SANITY_IMPORT_PATH github.com/kubernetes-csi/csi-test "csi-test package"
230+
configvar CSI_PROW_SANITY_VERSION v4.0.2 "csi-test version" # v4.0.2
231+
configvar CSI_PROW_SANITY_IMPORT_PATH github.com/kubernetes-csi/csi-test/v4 "csi-test package"
232232
configvar CSI_PROW_SANITY_SERVICE "hostpath-service" "Kubernetes TCP service name that exposes csi.sock"
233233
configvar CSI_PROW_SANITY_POD "csi-hostpathplugin-0" "Kubernetes pod with CSI driver"
234234
configvar CSI_PROW_SANITY_CONTAINER "hostpath" "Kubernetes container with CSI driver"

0 commit comments

Comments
 (0)