Merge commit '2cf3e9cc058f43d5dc627e8cc0bb512e5527b50a' into update-csi-release-tools
This commit is contained in:
commit
0d43bb7f77
@ -26,7 +26,7 @@ steps:
|
||||
# The image must contain bash and curl. Ideally it should also contain
|
||||
# the desired version of Go (currently defined in release-tools/prow.sh),
|
||||
# but that just speeds up the build and is not required.
|
||||
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20230623-56e06d7c18'
|
||||
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20240718-5ef92b5c36'
|
||||
entrypoint: ./.cloudbuild.sh
|
||||
env:
|
||||
- GIT_TAG=${_GIT_TAG}
|
||||
|
||||
@ -243,7 +243,7 @@ configvar CSI_PROW_SIDECAR_E2E_PATH "${CSI_PROW_SIDECAR_E2E_IMPORT_PATH}" "CSI S
|
||||
# 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 v5.2.0 "csi-test version"
|
||||
configvar CSI_PROW_SANITY_VERSION v5.3.1 "csi-test version"
|
||||
configvar CSI_PROW_SANITY_PACKAGE_PATH github.com/kubernetes-csi/csi-test "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"
|
||||
@ -441,7 +441,8 @@ run_with_go () {
|
||||
else
|
||||
version=local
|
||||
fi
|
||||
GOTOOLCHAIN=$version run "$@"
|
||||
# Set GOMODCACHE to make sure Kubernetes does not need to download again.
|
||||
GOTOOLCHAIN=$version GOMODCACHE="$(go env GOMODCACHE)" run "$@"
|
||||
}
|
||||
|
||||
# Ensure that we have the desired version of kind.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user