diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index af5abb04955..b19842b71e0 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -479,6 +479,7 @@ case ${JOB_NAME} in : ${E2E_DOWN:="false"} : ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-cluster"} ;; + kubernetes-upgrade-gke-step3-e2e) : ${DOGFOOD_GCLOUD:="true"} : ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"} @@ -494,9 +495,47 @@ case ${JOB_NAME} in ${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \ ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \ )"} - ;; + kubernetes-upgrade-gce-step1-deploy) + : ${E2E_CLUSTER_NAME:="gce-upgrade"} + : ${E2E_NETWORK:="gce-upgrade"} + : ${JENKINS_USE_RELEASE_TARS:=y} + : ${PROJECT:="k8s-jkns-gce-upgrade"} + : ${E2E_UP:="true"} + : ${E2E_TEST:="false"} + : ${E2E_DOWN:="false"} + ;; + + kubernetes-upgrade-gce-step2-upgrade) + : ${E2E_CLUSTER_NAME:="gce-upgrade"} + : ${E2E_NETWORK:="gce-upgrade"} + : ${E2E_OPT:="--check_version_skew=false"} + : ${JENKINS_FORCE_GET_TARS:=y} + : ${JENKINS_USE_RELEASE_TARS:=n} + : ${PROJECT:="k8s-jkns-gce-upgrade"} + : ${E2E_UP:="false"} + : ${E2E_TEST:="true"} + : ${E2E_DOWN:="false"} + : ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-cluster"} + ;; + + kubernetes-upgrade-gce-step3-e2e) + : ${E2E_CLUSTER_NAME:="gce-upgrade"} + : ${E2E_NETWORK:="gce-upgrade"} + : ${E2E_OPT:="--check_version_skew=false"} + : ${PROJECT:="k8s-jkns-gce-upgrade"} + : ${E2E_UP:="false"} + : ${E2E_TEST:="true"} + : ${E2E_DOWN:="true"} + : ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \ + ${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \ + ${GCE_PARALLEL_SKIP_TESTS[@]:+${GCE_PARALLEL_SKIP_TESTS[@]}} \ + ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \ + ${GCE_PARALLEL_FLAKY_TESTS[@]:+${GCE_PARALLEL_FLAKY_TESTS[@]}} \ + ${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \ + )"} + ;; esac # AWS variables