Merge pull request #21515 from ihmccreery/upgrade-target-to-latest

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-18 16:15:28 -08:00
commit 1c1c57719a

View File

@ -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"