Merge pull request #24274 from euank/configurable-release-bucket

Automatic merge from submit-queue

jenkins: Allow configuration of release bucket

This allows others to leverage the existing E2E code to test some
patched kube binary by simply overriding the bucket and reusing many of
the existing scripts

build/push-ci-build.sh

@@ -40,7 +40,7 @@ KUBE_GCS_NO_CACHING='n'
 KUBE_GCS_MAKE_PUBLIC='y'
 KUBE_GCS_UPLOAD_RELEASE='y'
 KUBE_GCS_DELETE_EXISTING='y'
-KUBE_GCS_RELEASE_BUCKET='kubernetes-release'
+: ${KUBE_GCS_RELEASE_BUCKET:='kubernetes-release'}
 KUBE_GCS_RELEASE_PREFIX="ci/${LATEST}"
 KUBE_GCS_PUBLISH_VERSION="${LATEST}"
 

cluster/gce/util.sh

@@ -738,8 +738,8 @@ function create-nodes() {
         --template "$template_name" || true;
     gcloud compute instance-groups managed wait-until-stable \
         "${NODE_INSTANCE_PREFIX}-group-$i" \
-	      --zone "${ZONE}" \
-	      --project "${PROJECT}" || true;
+        --zone "${ZONE}" \
+        --project "${PROJECT}" || true;
   done
 
   # TODO: We don't add a suffix for the last group to keep backward compatibility when there's only one MIG.

hack/jenkins/e2e-runner.sh

@@ -21,6 +21,8 @@ set -o nounset
 set -o pipefail
 set -o xtrace
 
+: ${KUBE_GCS_RELEASE_BUCKET:="kubernetes-release"}
+
 function running_in_docker() {
     grep -q docker /proc/self/cgroup
 }
@@ -46,7 +48,7 @@ function fetch_published_version_tars() {
     local -r published_version="${1}"
     IFS='/' read -a varr <<< "${published_version}"
     bucket="${varr[0]}"
-    build_version=$(gsutil cat gs://kubernetes-release/${published_version}.txt)
+    build_version=$(gsutil cat gs://${KUBE_GCS_RELEASE_BUCKET}/${published_version}.txt)
     echo "Using published version $bucket/$build_version (from ${published_version})"
     fetch_tars_from_gcs "${bucket}" "${build_version}"
     unpack_binaries
@@ -66,8 +68,8 @@ function fetch_tars_from_gcs() {
     local -r build_version="${2}"
     echo "Pulling binaries from GCS; using server version ${bucket}/${build_version}."
     gsutil -mq cp \
-        "gs://kubernetes-release/${bucket}/${build_version}/kubernetes.tar.gz" \
-        "gs://kubernetes-release/${bucket}/${build_version}/kubernetes-test.tar.gz" \
+        "gs://${KUBE_GCS_RELEASE_BUCKET}/${bucket}/${build_version}/kubernetes.tar.gz" \
+        "gs://${KUBE_GCS_RELEASE_BUCKET}/${bucket}/${build_version}/kubernetes-test.tar.gz" \
         .
 }