From fcba3136d09d879b92d29a307557512766c70d45 Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Fri, 12 Jun 2015 15:18:47 -0700 Subject: [PATCH] Allow adding a suffix to the devel staging path for server tars on GCS. This is needed to allow multiple GCE e2e runs to occur using the same project on Jenkins. --- cluster/gce/util.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index 82a97ef7119..68139ccf7a3 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -35,6 +35,10 @@ ALLOCATE_NODE_CIDRS=true KUBE_PROMPT_FOR_UPDATE=y KUBE_SKIP_UPDATE=${KUBE_SKIP_UPDATE-"n"} +# Suffix to append to the staging path used for the server tars. Useful if +# multiple versions of the server are being used in the same project +# simultaneously (e.g. on Jenkins). +KUBE_GCS_STAGING_PATH_SUFFIX=${KUBE_GCS_STAGING_PATH_SUFFIX-""} # VERSION_REGEX matches things like "v0.13.1" readonly KUBE_VERSION_REGEX="^v(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)$" @@ -214,7 +218,7 @@ function upload-server-tars() { gsutil mb "${staging_bucket}" fi - local -r staging_path="${staging_bucket}/devel" + local -r staging_path="${staging_bucket}/devel${KUBE_GCS_STAGING_PATH_SUFFIX}" local server_hash local salt_hash