From 9477bc08a5302682efb9709bb2af33de9c33c33c Mon Sep 17 00:00:00 2001 From: Isaac Hollander McCreery Date: Fri, 22 Jan 2016 15:27:33 -0800 Subject: [PATCH] Use INSTANCE_PREFIX to prefix uploaded binaries in GCE, fixes #8705 --- cluster/gce/util.sh | 6 +----- hack/jenkins/e2e.sh | 2 -- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index be69e01389f..dd907fc973c 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -36,10 +36,6 @@ 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-""} # How long (in seconds) to wait for cluster initialization. KUBE_CLUSTER_INITIALIZATION_TIMEOUT=${KUBE_CLUSTER_INITIALIZATION_TIMEOUT:-300} @@ -201,7 +197,7 @@ function upload-server-tars() { gsutil mb "${staging_bucket}" fi - local -r staging_path="${staging_bucket}/devel${KUBE_GCS_STAGING_PATH_SUFFIX}" + local -r staging_path="${staging_bucket}/${INSTANCE_PREFIX}-devel" SERVER_BINARY_TAR_HASH=$(sha1sum-file "${SERVER_BINARY_TAR}") SALT_TAR_HASH=$(sha1sum-file "${SALT_TAR}") diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index 0c889fdd19e..c22cb3f76e6 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -439,7 +439,6 @@ case ${JOB_NAME} in ${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \ )"} : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-gce-${NODE_NAME}-${EXECUTOR_NUMBER}"} - : ${KUBE_GCS_STAGING_PATH_SUFFIX:="-${NODE_NAME}-${EXECUTOR_NUMBER}"} : ${PROJECT:="kubernetes-jenkins-pull"} : ${ENABLE_DEPLOYMENTS:=true} # Override GCE defaults @@ -967,7 +966,6 @@ export INSTANCE_PREFIX=${E2E_CLUSTER_NAME} export KUBE_GCE_ZONE=${E2E_ZONE} export KUBE_GCE_NETWORK=${E2E_NETWORK} export KUBE_GCE_INSTANCE_PREFIX=${KUBE_GCE_INSTANCE_PREFIX:-} -export KUBE_GCS_STAGING_PATH_SUFFIX=${KUBE_GCS_STAGING_PATH_SUFFIX:-} export KUBE_GCE_NODE_PROJECT=${KUBE_GCE_NODE_PROJECT:-} export KUBE_GCE_NODE_IMAGE=${KUBE_GCE_NODE_IMAGE:-} export KUBE_OS_DISTRIBUTION=${KUBE_OS_DISTRIBUTION:-}