From 194abade89e2e12263a740cd0f0b9050f5bb3de3 Mon Sep 17 00:00:00 2001 From: Isaac Hollander McCreery Date: Thu, 18 Feb 2016 15:10:35 -0800 Subject: [PATCH] Default upgrade-target (ci/latest) for upgrade jobs on master --- hack/jenkins/e2e.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index e0d60b77be4..b517a257878 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -90,7 +90,7 @@ if [[ ${JOB_NAME} =~ ^kubernetes-upgrade ]]; then export E2E_OPT="--check_version_skew=false" export E2E_UP="false" export E2E_DOWN="false" - export GINKGO_TEST_ARGS="--ginkgo.focus=\[Feature:Upgrade\].*upgrade-master --upgrade-target=${new_version}" + export GINKGO_TEST_ARGS="--ginkgo.focus=\[Feature:Upgrade\].*upgrade-master" elif [[ "${JOB_NAME}" =~ step4 ]]; then export E2E_OPT="--check_version_skew=false" export E2E_UP="false" @@ -99,7 +99,7 @@ if [[ ${JOB_NAME} =~ ^kubernetes-upgrade ]]; then export E2E_OPT="--check_version_skew=false" export E2E_UP="false" export E2E_DOWN="false" - export GINKGO_TEST_ARGS="--ginkgo.focus=\[Feature:Upgrade\].*upgrade-cluster --upgrade-target=${new_version}" + export GINKGO_TEST_ARGS="--ginkgo.focus=\[Feature:Upgrade\].*upgrade-cluster" elif [[ "${JOB_NAME}" =~ step6 ]]; then export E2E_OPT="--check_version_skew=false" export E2E_UP="false"