Skip to content

K
k3s
Commit 194abade authored by Isaac Hollander McCreery's avatar Isaac Hollander McCreery
Browse files
Options

Default upgrade-target (ci/latest) for upgrade jobs on master

parent abd92a21
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
hack/jenkins/e2e.sh
View file @ 194abade
...@@ -90,7 +90,7 @@ if [[ ${JOB_NAME} =~ ^kubernetes-upgrade ]]; then ...@@ -90,7 +90,7 @@ if [[ ${JOB_NAME} =~ ^kubernetes-upgrade ]]; then
export E2E_OPT="--check_version_skew=false" export E2E_OPT="--check_version_skew=false"
export E2E_UP="false" export E2E_UP="false"
export E2E_DOWN="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 elif [[ "${JOB_NAME}" =~ step4 ]]; then
export E2E_OPT="--check_version_skew=false" export E2E_OPT="--check_version_skew=false"
export E2E_UP="false" export E2E_UP="false"
...@@ -99,7 +99,7 @@ if [[ ${JOB_NAME} =~ ^kubernetes-upgrade ]]; then ...@@ -99,7 +99,7 @@ if [[ ${JOB_NAME} =~ ^kubernetes-upgrade ]]; then
export E2E_OPT="--check_version_skew=false" export E2E_OPT="--check_version_skew=false"
export E2E_UP="false" export E2E_UP="false"
export E2E_DOWN="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 elif [[ "${JOB_NAME}" =~ step6 ]]; then
export E2E_OPT="--check_version_skew=false" export E2E_OPT="--check_version_skew=false"
export E2E_UP="false" export E2E_UP="false"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment