Skip to content

Commit

Permalink
Configure upgrade jobs to use 7-step upgrade, and remove obsolete con…
Browse files Browse the repository at this point in the history 
…figs
  • Loading branch information
Isaac Hollander McCreery committed Dec 8, 2015
1 parent cb56fdc commit 2838af6
Showing 1 changed file with 16 additions and 152 deletions.
168 changes: 16 additions & 152 deletions hack/jenkins/e2e.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -695,183 +695,47 @@ case ${JOB_NAME} in
)"}
;;

# kubernetes-upgrade-gke

kubernetes-upgrade-gke-step1-deploy)
configure_upgrade_step 'release/latest' 'ci/latest' 'gke-upgrade' 'kubernetes-jenkins-gke-upgrade'
;;

kubernetes-upgrade-gke-step2-upgrade-master)
configure_upgrade_step 'release/latest' 'ci/latest' 'gke-upgrade' 'kubernetes-jenkins-gke-upgrade'
;;

kubernetes-upgrade-gke-step3-e2e-old)
configure_upgrade_step 'release/latest' 'ci/latest' 'gke-upgrade' 'kubernetes-jenkins-gke-upgrade'
;;

kubernetes-upgrade-gke-step4-upgrade-cluster)
configure_upgrade_step 'release/latest' 'ci/latest' 'gke-upgrade' 'kubernetes-jenkins-gke-upgrade'
;;

kubernetes-upgrade-gke-step5-e2e-old)
configure_upgrade_step 'release/latest' 'ci/latest' 'gke-upgrade' 'kubernetes-jenkins-gke-upgrade'
;;

kubernetes-upgrade-gke-step6-e2e-new)
configure_upgrade_step 'release/latest' 'ci/latest' 'gke-upgrade' 'kubernetes-jenkins-gke-upgrade'
;;

# kubernetes-upgrade-gke-stable-latest
#
# This suite:
#
# 1. launches a cluster at release/stable,
# 2. upgrades the master to release/latest,
# 3. runs release/stable e2es,
# 4. upgrades the rest of the cluster,
# 5. runs release/stable e2es again, then
# 6. runs release/latest e2es and tears down the cluster.

kubernetes-upgrade-stable-latest-gke-step1-deploy)
: ${DOGFOOD_GCLOUD:="true"}
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
: ${E2E_CLUSTER_NAME:="gke-upgrade-stable-latest"}
: ${E2E_NETWORK:="gke-upgrade-stable-latest"}
: ${JENKINS_PUBLISHED_VERSION:="release/stable"}
: ${E2E_SET_CLUSTER_API_VERSION:=y}
: ${PROJECT:="k8s-jkns-upgrade-fixed-1"}
: ${E2E_UP:="true"}
: ${E2E_TEST:="false"}
: ${E2E_DOWN:="false"}
;;

kubernetes-upgrade-stable-latest-gke-step2-upgrade-master)
: ${DOGFOOD_GCLOUD:="true"}
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
: ${E2E_CLUSTER_NAME:="gke-upgrade-stable-latest"}
: ${E2E_NETWORK:="gke-upgrade-stable-latest"}
: ${E2E_OPT:="--check_version_skew=false"}
# Use upgrade logic of version we're upgrading to.
: ${JENKINS_PUBLISHED_VERSION:="release/latest"}
: ${JENKINS_FORCE_GET_TARS:=y}
: ${PROJECT:="k8s-jkns-upgrade-fixed-1"}
: ${E2E_UP:="false"}
: ${E2E_TEST:="true"}
: ${E2E_DOWN:="false"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=Cluster\sUpgrade.*upgrade-master --upgrade-target=release/latest"}
;;

kubernetes-upgrade-stable-latest-gke-step3-e2e-old)
: ${DOGFOOD_GCLOUD:="true"}
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
: ${E2E_CLUSTER_NAME:="gke-upgrade-stable-latest"}
: ${E2E_NETWORK:="gke-upgrade-stable-latest"}
: ${E2E_OPT:="--check_version_skew=false"}
: ${JENKINS_FORCE_GET_TARS:=y}
# Run old e2es
: ${JENKINS_PUBLISHED_VERSION:="release/stable"}
: ${PROJECT:="k8s-jkns-upgrade-fixed-1"}
: ${E2E_UP:="false"}
: ${E2E_TEST:="true"}
: ${E2E_DOWN:="false"}
: ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \
${GKE_DEFAULT_SKIP_TESTS[@]:+${GKE_DEFAULT_SKIP_TESTS[@]}} \
${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \
${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \
${GKE_FLAKY_TESTS[@]:+${GKE_FLAKY_TESTS[@]}} \
)"}
;;

kubernetes-upgrade-stable-latest-gke-step4-upgrade-cluster)
: ${DOGFOOD_GCLOUD:="true"}
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
: ${E2E_CLUSTER_NAME:="gke-upgrade-stable-latest"}
: ${E2E_NETWORK:="gke-upgrade-stable-latest"}
: ${E2E_OPT:="--check_version_skew=false"}
# Use upgrade logic of version we're upgrading to.
: ${JENKINS_PUBLISHED_VERSION:="release/latest"}
: ${JENKINS_FORCE_GET_TARS:=y}
: ${PROJECT:="k8s-jkns-upgrade-fixed-1"}
: ${E2E_UP:="false"}
: ${E2E_TEST:="true"}
: ${E2E_DOWN:="false"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=Cluster\sUpgrade.*upgrade-cluster --upgrade-target=release/latest"}
;;

kubernetes-upgrade-stable-latest-gke-step5-e2e-old)
: ${DOGFOOD_GCLOUD:="true"}
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
: ${E2E_CLUSTER_NAME:="gke-upgrade-stable-latest"}
: ${E2E_NETWORK:="gke-upgrade-stable-latest"}
: ${E2E_OPT:="--check_version_skew=false"}
: ${JENKINS_FORCE_GET_TARS:=y}
# Run old e2es
: ${JENKINS_PUBLISHED_VERSION:="release/stable"}
: ${PROJECT:="k8s-jkns-upgrade-fixed-1"}
: ${E2E_UP:="false"}
: ${E2E_TEST:="true"}
: ${E2E_DOWN:="false"}
: ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \
${GKE_DEFAULT_SKIP_TESTS[@]:+${GKE_DEFAULT_SKIP_TESTS[@]}} \
${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \
${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \
${GKE_FLAKY_TESTS[@]:+${GKE_FLAKY_TESTS[@]}} \
)"}
;;

kubernetes-upgrade-stable-latest-gke-step6-e2e-new)
: ${DOGFOOD_GCLOUD:="true"}
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
: ${E2E_CLUSTER_NAME:="gke-upgrade-stable-latest"}
: ${E2E_NETWORK:="gke-upgrade-stable-latest"}
: ${JENKINS_FORCE_GET_TARS:=y}
: ${JENKINS_PUBLISHED_VERSION:="release/latest"}
: ${PROJECT:="k8s-jkns-upgrade-fixed-1"}
: ${E2E_UP:="false"}
: ${E2E_TEST:="true"}
: ${E2E_DOWN:="true"}
: ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \
${GKE_DEFAULT_SKIP_TESTS[@]:+${GKE_DEFAULT_SKIP_TESTS[@]}} \
${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \
${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \
${GKE_FLAKY_TESTS[@]:+${GKE_FLAKY_TESTS[@]}} \
${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \
)"}
;;

# kubernetes-upgrade-gke-1.0-master
#
# Test upgrades from the latest release-1.0 build to the latest master build.
#
# Configurations for step1, step3, and step5 live in the release-1.0 branch.
# Configurations for step1, step4, and step6 live in the release-1.0 branch.

kubernetes-upgrade-gke-1.0-master-step2-upgrade-master)
kubernetes-upgrade-gke-1.0-master-step2-kubectl-e2e-new)
configure_upgrade_step 'configured-in-release-1.0' 'ci/latest' 'upgrade-gke-1-0-master' 'kubernetes-jenkins-gke-upgrade'
;;

kubernetes-upgrade-gke-1.0-master-step4-upgrade-cluster)
kubernetes-upgrade-gke-1.0-master-step3-upgrade-master)
configure_upgrade_step 'configured-in-release-1.0' 'ci/latest' 'upgrade-gke-1-0-master' 'kubernetes-jenkins-gke-upgrade'
;;

kubernetes-upgrade-gke-1.0-master-step6-e2e-new)
kubernetes-upgrade-gke-1.0-master-step5-upgrade-cluster)
configure_upgrade_step 'configured-in-release-1.0' 'ci/latest' 'upgrade-gke-1-0-master' 'kubernetes-jenkins-gke-upgrade'
;;

kubernetes-upgrade-gke-1.0-master-step7-e2e-new)
configure_upgrade_step 'configured-in-release-1.0' 'ci/latest' 'upgrade-gke-1-0-master' 'kubernetes-jenkins-gke-upgrade'
;;

# kubernetes-upgrade-gke-1.1-master
#
# Test upgrades from the latest release-1.1 build to the latest master build.
#
# Configurations for step1, step3, and step5 live in the release-1.1 branch.
# Configurations for step1, step4, and step6 live in the release-1.1 branch.

kubernetes-upgrade-gke-1.1-master-step2-kubectl-e2e-new)
configure_upgrade_step 'configured-in-release-1.1' 'ci/latest' 'upgrade-gke-1-1-master' 'kubernetes-jenkins-gke-upgrade'
;;

kubernetes-upgrade-gke-1.1-master-step2-upgrade-master)
kubernetes-upgrade-gke-1.1-master-step3-upgrade-master)
configure_upgrade_step 'configured-in-release-1.1' 'ci/latest' 'upgrade-gke-1-1-master' 'kubernetes-jenkins-gke-upgrade'
;;

kubernetes-upgrade-gke-1.1-master-step4-upgrade-cluster)
kubernetes-upgrade-gke-1.1-master-step5-upgrade-cluster)
configure_upgrade_step 'configured-in-release-1.1' 'ci/latest' 'upgrade-gke-1-1-master' 'kubernetes-jenkins-gke-upgrade'
;;

kubernetes-upgrade-gke-1.1-master-step6-e2e-new)
kubernetes-upgrade-gke-1.1-master-step7-e2e-new)
configure_upgrade_step 'configured-in-release-1.1' 'ci/latest' 'upgrade-gke-1-1-master' 'kubernetes-jenkins-gke-upgrade'
;;

Expand Down

0 comments on commit 2838af6

Please sign in to comment.