diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index 93a9d0ee3d..3ffa31b516 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -730,11 +730,46 @@ case ${JOB_NAME} in : ${E2E_UP:="true"} : ${E2E_TEST:="false"} : ${E2E_DOWN:="false"} - : ${ENABLE_DEPLOYMENTS:=true} - NUM_MINIONS=3 + : ${ENABLE_EXPERIMENTAL_API:=true} + : ${NUM_MINIONS:=3} ;; - kubernetes-upgrade-gce-step2-upgrade) + kubernetes-upgrade-gce-step2-upgrade-master) + : ${E2E_CLUSTER_NAME:="gce-upgrade"} + : ${E2E_NETWORK:="gce-upgrade"} + : ${E2E_OPT:="--check_version_skew=false"} + : ${JENKINS_FORCE_GET_TARS:=y} + : ${PROJECT:="k8s-jkns-gce-upgrade"} + : ${E2E_UP:="false"} + : ${E2E_TEST:="true"} + : ${E2E_DOWN:="false"} + : ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-master"} + : ${ENABLE_EXPERIMENTAL_API:=true} + : ${NUM_MINIONS:=3} + ;; + + kubernetes-upgrade-gce-step3-e2e-old) + : ${E2E_CLUSTER_NAME:="gce-upgrade"} + : ${E2E_NETWORK:="gce-upgrade"} + : ${E2E_OPT:="--check_version_skew=false"} + : ${JENKINS_FORCE_GET_TARS:=y} + : ${JENKINS_USE_RELEASE_TARS:=y} + : ${JENKINS_FORCE_GET_TARS:=y} + # Run release/latest e2es + : ${JENKINS_PUBLISHED_VERSION:="release/latest"} + : ${PROJECT:="k8s-jkns-gce-upgrade"} + : ${E2E_UP:="false"} + : ${E2E_TEST:="true"} + : ${E2E_DOWN:="false"} + : ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \ + ${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \ + ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \ + )"} + : ${ENABLE_EXPERIMENTAL_API:=true} + : ${NUM_MINIONS:=3} + ;; + + kubernetes-upgrade-gce-step4-upgrade-cluster) : ${E2E_CLUSTER_NAME:="gce-upgrade"} : ${E2E_NETWORK:="gce-upgrade"} : ${E2E_OPT:="--check_version_skew=false"} @@ -744,25 +779,47 @@ case ${JOB_NAME} in : ${E2E_TEST:="true"} : ${E2E_DOWN:="false"} : ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-cluster"} - NUM_MINIONS=3 + : ${ENABLE_EXPERIMENTAL_API:=true} + : ${NUM_MINIONS:=3} ;; - kubernetes-upgrade-gce-step3-e2e) + kubernetes-upgrade-gce-step5-e2e-old) : ${E2E_CLUSTER_NAME:="gce-upgrade"} : ${E2E_NETWORK:="gce-upgrade"} : ${E2E_OPT:="--check_version_skew=false"} + : ${JENKINS_FORCE_GET_TARS:=y} + # Run release/latest e2es + : ${JENKINS_PUBLISHED_VERSION:="release/latest"} + : ${PROJECT:="k8s-jkns-gce-upgrade"} + : ${E2E_UP:="false"} + : ${E2E_TEST:="true"} + : ${E2E_DOWN:="false"} + : ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \ + ${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \ + ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \ + )"} + : ${ENABLE_EXPERIMENTAL_API:=true} + : ${NUM_MINIONS:=3} + ;; + + kubernetes-upgrade-gce-step6-e2e-new) + : ${E2E_CLUSTER_NAME:="gce-upgrade"} + : ${E2E_NETWORK:="gce-upgrade"} + # TODO(15011): these really shouldn't be (very) version skewed, but because + # we have to rebuild, it could get slightly out of whack. + : ${E2E_OPT:="--check_version_skew=false"} + : ${JENKINS_FORCE_GET_TARS:=y} : ${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[@]}} \ )"} - NUM_MINIONS=3 + : ${ENABLE_EXPERIMENTAL_API:=true} + : ${NUM_MINIONS:=3} ;; # Run Kubemark test on a fake 100 node cluster to have a comparison @@ -833,6 +890,7 @@ export E2E_MIN_STARTUP_PODS=${E2E_MIN_STARTUP_PODS:-} export KUBE_ENABLE_CLUSTER_MONITORING=${ENABLE_CLUSTER_MONITORING:-} export KUBE_ENABLE_HORIZONTAL_POD_AUTOSCALER=${ENABLE_HORIZONTAL_POD_AUTOSCALER:-} export KUBE_ENABLE_DEPLOYMENTS=${ENABLE_DEPLOYMENTS:-} +export KUBE_ENABLE_EXPERIMENTAL_API=${ENABLE_EXPERIMENTAL_API:-} export MASTER_SIZE=${MASTER_SIZE:-} export MINION_SIZE=${MINION_SIZE:-} export NUM_MINIONS=${NUM_MINIONS:-}