Add 7-stage upgrade configs to configure_upgrade_step

This commit is contained in:
Isaac Hollander McCreery 2015-12-08 15:32:08 -08:00
parent d568a92d63
commit cb56fdc27e

View File

@ -51,11 +51,12 @@ function join_regex_no_empty() {
# #
# These suites: # These suites:
# step1: launch a cluster at $old_version, # step1: launch a cluster at $old_version,
# step2: upgrades the master to $new_version, # step2: runs $new_version Kubectl e2es,
# step3: runs $old_version e2es, # step3: upgrades the master to $new_version,
# step4: upgrades the rest of the cluster, # step4: runs $old_version e2es,
# step5: runs $old_version e2es again, then # step5: upgrades the rest of the cluster,
# step6: runs $new_version e2es and tears down the cluster. # step6: runs $old_version e2es again, then
# step7: runs $new_version e2es and tears down the cluster.
# #
# Assumes globals: # Assumes globals:
# $JOB_NAME # $JOB_NAME
@ -125,6 +126,18 @@ function configure_upgrade_step() {
;; ;;
step2) step2)
# Run new e2e kubectl tests
JENKINS_PUBLISHED_VERSION="${new_version}"
JENKINS_FORCE_GET_TARS=y
E2E_OPT="--check_version_skew=false"
E2E_UP="false"
E2E_TEST="true"
E2E_DOWN="false"
GINKGO_TEST_ARGS="--ginkgo.focus=Kubectl"
;;
step3)
# Use upgrade logic of version we're upgrading to. # Use upgrade logic of version we're upgrading to.
JENKINS_PUBLISHED_VERSION="${new_version}" JENKINS_PUBLISHED_VERSION="${new_version}"
JENKINS_FORCE_GET_TARS=y JENKINS_FORCE_GET_TARS=y
@ -136,7 +149,7 @@ function configure_upgrade_step() {
GINKGO_TEST_ARGS="--ginkgo.focus=Cluster\sUpgrade.*upgrade-master --upgrade-target=${new_version}" GINKGO_TEST_ARGS="--ginkgo.focus=Cluster\sUpgrade.*upgrade-master --upgrade-target=${new_version}"
;; ;;
step3) step4)
# Run old e2es # Run old e2es
JENKINS_PUBLISHED_VERSION="${old_version}" JENKINS_PUBLISHED_VERSION="${old_version}"
JENKINS_FORCE_GET_TARS=y JENKINS_FORCE_GET_TARS=y
@ -153,7 +166,7 @@ function configure_upgrade_step() {
fi fi
;; ;;
step4) step5)
# Use upgrade logic of version we're upgrading to. # Use upgrade logic of version we're upgrading to.
JENKINS_PUBLISHED_VERSION="${new_version}" JENKINS_PUBLISHED_VERSION="${new_version}"
JENKINS_FORCE_GET_TARS=y JENKINS_FORCE_GET_TARS=y
@ -165,7 +178,7 @@ function configure_upgrade_step() {
GINKGO_TEST_ARGS="--ginkgo.focus=Cluster\sUpgrade.*upgrade-cluster --upgrade-target=${new_version}" GINKGO_TEST_ARGS="--ginkgo.focus=Cluster\sUpgrade.*upgrade-cluster --upgrade-target=${new_version}"
;; ;;
step5) step6)
# Run old e2es # Run old e2es
JENKINS_PUBLISHED_VERSION="${old_version}" JENKINS_PUBLISHED_VERSION="${old_version}"
JENKINS_FORCE_GET_TARS=y JENKINS_FORCE_GET_TARS=y
@ -182,7 +195,7 @@ function configure_upgrade_step() {
fi fi
;; ;;
step6) step7)
# Run new e2es # Run new e2es
JENKINS_PUBLISHED_VERSION="${new_version}" JENKINS_PUBLISHED_VERSION="${new_version}"
JENKINS_FORCE_GET_TARS=y JENKINS_FORCE_GET_TARS=y