From 54afad28db87ee471f8d947c97ecb68facc3b02b Mon Sep 17 00:00:00 2001 From: Jeff Lowdermilk Date: Fri, 9 Oct 2015 15:25:20 -0700 Subject: [PATCH] Rename e2e-gce-rc to e2e-gce-release-1.1 and add gcs staging suffix to avoid colliding with kubernetes-e2e-gce-release-1.0 --- hack/jenkins/e2e.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index 3b4dd9a240..d137aebab0 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -396,15 +396,16 @@ case ${JOB_NAME} in # or flaky test list on the release branch, you'll need to propose a # pull request directly to the release branch itself. kubernetes-e2e-gce-rc) - : ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-rc"} + : ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-release-1.1"} : ${E2E_DOWN:="false"} - : ${E2E_NETWORK:="gce-e2e-rc"} + : ${E2E_NETWORK:="gce-e2e-1-1"} : ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \ ${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \ ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \ ${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \ )"} - : ${KUBE_GCE_INSTANCE_PREFIX="e2e-gce-rc"} + : ${KUBE_GCE_INSTANCE_PREFIX="e2e-gce-1-1"} + : ${KUBE_GCS_STAGING_PATH_SUFFIX:="release-1.1"} : ${PROJECT:="k8s-jkns-e2e-gce-release"} : ${ENABLE_DEPLOYMENTS:=true} ;;