Skip to content

Commit 0b34631

Browse files
authored
Merge pull request #42 from pohly/prow-update-master
master: update release-tools
2 parents 6294dce + 1079793 commit 0b34631

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

release-tools/cloudbuild.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
#
1313
# See https://github.com/kubernetes/test-infra/blob/master/config/jobs/image-pushing/README.md
1414
# for more details on image pushing process in Kubernetes.
15+
#
16+
# To promote release images, see https://github.com/kubernetes/k8s.io/tree/master/k8s.gcr.io/images/k8s-staging-sig-storage.
1517

1618
# This must be specified in seconds. If omitted, defaults to 600s (10 mins).
1719
timeout: 1200s
@@ -38,7 +40,7 @@ substitutions:
3840
# a branch like 'master' or 'release-0.2', or a tag like 'v0.2'.
3941
_PULL_BASE_REF: 'master'
4042
# The default gcr.io staging project for Kubernetes-CSI
41-
# (=> https://console.cloud.google.com/gcr/images/k8s-staging-csi/GLOBAL).
43+
# (=> https://console.cloud.google.com/gcr/images/k8s-staging-sig-storage/GLOBAL).
4244
# Might be overridden in the Prow build job for a repo which wants
4345
# images elsewhere.
44-
_STAGING_PROJECT: 'k8s-staging-csi'
46+
_STAGING_PROJECT: 'k8s-staging-sig-storage'

release-tools/prow.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ get_versioned_variable () {
8585
echo "$value"
8686
}
8787

88-
configvar CSI_PROW_BUILD_PLATFORMS "linux amd64; windows amd64 .exe; linux ppc64le -ppc64le; linux s390x -s390x" "Go target platforms (= GOOS + GOARCH) and file suffix of the resulting binaries"
88+
configvar CSI_PROW_BUILD_PLATFORMS "linux amd64; windows amd64 .exe; linux ppc64le -ppc64le; linux s390x -s390x; linux arm64 -arm64" "Go target platforms (= GOOS + GOARCH) and file suffix of the resulting binaries"
8989

9090
# If we have a vendor directory, then use it. We must be careful to only
9191
# use this for "make" invocations inside the project's repo itself because
@@ -1198,6 +1198,12 @@ gcr_cloud_build () {
11981198
# Required for "docker buildx build --push".
11991199
gcloud auth configure-docker
12001200

1201+
if find . -name Dockerfile | grep -v ^./vendor | xargs --no-run-if-empty cat | grep -q ^RUN; then
1202+
# Needed for "RUN" steps on non-linux/amd64 platforms.
1203+
# See https://github.com/multiarch/qemu-user-static#getting-started
1204+
(set -x; docker run --rm --privileged multiarch/qemu-user-static --reset -p yes)
1205+
fi
1206+
12011207
# Extract tag-n-hash value from GIT_TAG (form vYYYYMMDD-tag-n-hash) for REV value.
12021208
REV=v$(echo "$GIT_TAG" | cut -f3- -d 'v')
12031209

0 commit comments

Comments
 (0)