Skip to content

Commit 534c4ed

Browse files
committed
Squashed 'release-tools/' changes from 98f23071d..049659326
049659326 Merge pull request #268 from huww98/cloudbuild 119aee1ff Merge pull request #266 from jsafrane/bump-sanity-5.3.1 0ae5e52d9 Update cloudbuild image with go 1.21+ 406a79acf Merge pull request #267 from huww98/gomodcache 9cec273d8 Set GOMODCACHE to avoid re-download toolchain 43bde065f Bump csi-sanity to 5.3.1 git-subtree-dir: release-tools git-subtree-split: 04965932661b6e62709dcdbb9c25da528bac2605
1 parent 2ae52b4 commit 534c4ed

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ steps:
2626
# The image must contain bash and curl. Ideally it should also contain
2727
# the desired version of Go (currently defined in release-tools/prow.sh),
2828
# but that just speeds up the build and is not required.
29-
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20230623-56e06d7c18'
29+
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20240718-5ef92b5c36'
3030
entrypoint: ./.cloudbuild.sh
3131
env:
3232
- GIT_TAG=${_GIT_TAG}

prow.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ configvar CSI_PROW_SIDECAR_E2E_PATH "${CSI_PROW_SIDECAR_E2E_IMPORT_PATH}" "CSI S
243243
# of the cluster. The alternative would have been to (cross-)compile csi-sanity
244244
# and install it inside the cluster, which is not necessarily easier.
245245
configvar CSI_PROW_SANITY_REPO https://github.com/kubernetes-csi/csi-test "csi-test repo"
246-
configvar CSI_PROW_SANITY_VERSION v5.2.0 "csi-test version"
246+
configvar CSI_PROW_SANITY_VERSION v5.3.1 "csi-test version"
247247
configvar CSI_PROW_SANITY_PACKAGE_PATH github.com/kubernetes-csi/csi-test "csi-test package"
248248
configvar CSI_PROW_SANITY_SERVICE "hostpath-service" "Kubernetes TCP service name that exposes csi.sock"
249249
configvar CSI_PROW_SANITY_POD "csi-hostpathplugin-0" "Kubernetes pod with CSI driver"
@@ -441,7 +441,8 @@ run_with_go () {
441441
else
442442
version=local
443443
fi
444-
GOTOOLCHAIN=$version run "$@"
444+
# Set GOMODCACHE to make sure Kubernetes does not need to download again.
445+
GOTOOLCHAIN=$version GOMODCACHE="$(go env GOMODCACHE)" run "$@"
445446
}
446447

447448
# Ensure that we have the desired version of kind.

0 commit comments

Comments
 (0)