github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17661 from kubernetes/revert-17539-current-release-published-version

Browse Source 
Revert "Add CURRENT_RELEASE_PUBLISHED_VERSION to e2e.sh"
This commit is contained in:
Jerzy Szczepkowski 2015-11-23 16:34:15 +01:00
commit 32a74f08b0
1 changed files with 90 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

170
hack/jenkins/e2e.sh
View File

@ -111,11 +111,6 @@ if [[ "${KUBERNETES_PROVIDER}" == "aws" ]]; then
fi fi
fi fi
# CURRENT_RELEASE_PUBLISHED_VERSION is the JENKINS_PUBLISHED_VERSION for the
# release we are currently pointing our release testing infrastructure at.
# When 1.2.0-beta.0 comes out, e.g., this will become "ci/latest-1.2"
CURRENT_RELEASE_PUBLISHED_VERSION="ci/latest-1.1"
# Specialized to skip when running reboot tests. # Specialized to skip when running reboot tests.
REBOOT_SKIP_TESTS=( REBOOT_SKIP_TESTS=(
"Skipped" "Skipped"
@ -438,17 +433,15 @@ case ${JOB_NAME} in
TEST_CLUSTER_RESYNC_PERIOD="--min-resync-period=12h" TEST_CLUSTER_RESYNC_PERIOD="--min-resync-period=12h"
;; ;;
# Runs the performance/scalability tests on GCE using the latest current # Runs the performance/scalability tests on GCE using the latest 1.1 ci
# release ci. A larger cluster is used. # release. A larger cluster is used.
kubernetes-e2e-gce-scalability-current-release) kubernetes-e2e-gce-scalability-1.1)
: ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-scalability-current-release"} : ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-scalability-1.1"}
: ${E2E_NETWORK:="e2e-scalability-current-release"} : ${E2E_NETWORK:="e2e-scalability-1-1"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=Performance\ssuite"} : ${GINKGO_TEST_ARGS:="--ginkgo.focus=Performance\ssuite"}
: ${JENKINS_PUBLISHED_VERSION:="${CURRENT_RELEASE_PUBLISHED_VERSION}"} : ${JENKINS_PUBLISHED_VERSION:="ci/latest-1.1"}
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-scalability-current-release"} : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-scalability-1-1"}
: ${KUBE_GCS_STAGING_PATH_SUFFIX:="scalability-current-release"} : ${KUBE_GCS_STAGING_PATH_SUFFIX:="scalability-1.1"}
# This project is called ...-1-1 for historic reasons, (it was created
# during the 1.1 release cycle).
: ${PROJECT:="k8s-e2e-gce-scalability-1-1"} : ${PROJECT:="k8s-e2e-gce-scalability-1-1"}
# Override GCE defaults. # Override GCE defaults.
E2E_ZONE="us-east1-b" E2E_ZONE="us-east1-b"
@ -490,24 +483,24 @@ case ${JOB_NAME} in
: ${PROJECT:="kubernetes-jenkins"} : ${PROJECT:="kubernetes-jenkins"}
;; ;;
# Sets up the GCE soak cluster weekly using the latest current release ci. # Sets up the GCE soak cluster weekly using the latest 1.1 ci release.
kubernetes-soak-weekly-deploy-gce-current-release) kubernetes-soak-weekly-deploy-gce-1.1)
: ${E2E_CLUSTER_NAME:="gce-soak-weekly-current-release"} : ${E2E_CLUSTER_NAME:="gce-soak-weekly-1.1"}
: ${E2E_DOWN:="false"} : ${E2E_DOWN:="false"}
: ${E2E_NETWORK:="gce-soak-weekly-current-release"} : ${E2E_NETWORK:="gce-soak-weekly-1-1"}
: ${E2E_TEST:="false"} : ${E2E_TEST:="false"}
: ${E2E_UP:="true"} : ${E2E_UP:="true"}
: ${JENKINS_PUBLISHED_VERSION:="${CURRENT_RELEASE_PUBLISHED_VERSION}"} : ${JENKINS_PUBLISHED_VERSION:="ci/latest-1.1"}
: ${KUBE_GCE_INSTANCE_PREFIX:="gce-soak-weekly-current-release"} : ${KUBE_GCE_INSTANCE_PREFIX:="gce-soak-weekly-1-1"}
: ${KUBE_GCS_STAGING_PATH_SUFFIX:="soak-current-release"} : ${KUBE_GCS_STAGING_PATH_SUFFIX:="soak-1.1"}
: ${PROJECT:="kubernetes-jenkins"} : ${PROJECT:="kubernetes-jenkins"}
;; ;;
# Runs tests on GCE soak cluster for latest current release ci. # Runs tests on GCE soak cluster for latest 1.1 ci release.
kubernetes-soak-continuous-e2e-gce-current-release) kubernetes-soak-continuous-e2e-gce-1.1)
: ${E2E_CLUSTER_NAME:="gce-soak-weekly-current-release"} : ${E2E_CLUSTER_NAME:="gce-soak-weekly-1.1"}
: ${E2E_DOWN:="false"} : ${E2E_DOWN:="false"}
: ${E2E_NETWORK:="gce-soak-weekly-current-release"} : ${E2E_NETWORK:="gce-soak-weekly-1-1"}
: ${E2E_UP:="false"} : ${E2E_UP:="false"}
# Clear out any orphaned namespaces in case previous run was interrupted. # Clear out any orphaned namespaces in case previous run was interrupted.
: ${E2E_CLEAN_START:="true"} : ${E2E_CLEAN_START:="true"}
@ -516,12 +509,14 @@ case ${JOB_NAME} in
${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \ ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \
${GCE_SOAK_CONTINUOUS_SKIP_TESTS[@]:+${GCE_SOAK_CONTINUOUS_SKIP_TESTS[@]}} \ ${GCE_SOAK_CONTINUOUS_SKIP_TESTS[@]:+${GCE_SOAK_CONTINUOUS_SKIP_TESTS[@]}} \
)"} )"}
: ${KUBE_GCE_INSTANCE_PREFIX:="gce-soak-weekly-current-release"} : ${KUBE_GCE_INSTANCE_PREFIX:="gce-soak-weekly-1-1"}
: ${PROJECT:="kubernetes-jenkins"} : ${PROJECT:="kubernetes-jenkins"}
;; ;;
# Runs non-flaky tests on GCE on the release-1.0 branch, # Runs non-flaky tests on GCE on the release-1.0 branch,
# sequentially. # sequentially. As a reminder, if you need to change the skip list
# or flaky test list on the release branch, you'll need to propose a
# pull request directly to the release branch itself.
kubernetes-e2e-gce-release-1.0) kubernetes-e2e-gce-release-1.0)
: ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-release-1.0"} : ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-release-1.0"}
: ${E2E_DOWN:="false"} : ${E2E_DOWN:="false"}
@ -619,30 +614,32 @@ case ${JOB_NAME} in
: ${FAIL_ON_GCP_RESOURCE_LEAK:="true"} : ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
;; ;;
# Runs non-flaky tests on GCE sequntially, against the latest current release # Runs non-flaky tests on GCE on the release candidate branch,
# ci. # sequentially. As a reminder, if you need to change the skip list
kubernetes-e2e-gce-current-release) # or flaky test list on the release branch, you'll need to propose a
: ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-current-release"} # pull request directly to the release branch itself.
kubernetes-e2e-gce-release-1.1)
: ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-release-1.1"}
: ${E2E_DOWN:="false"} : ${E2E_DOWN:="false"}
: ${E2E_NETWORK:="gce-e2e-current-release"} : ${E2E_NETWORK:="gce-e2e-1-1"}
: ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \ : ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \
${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \ ${GCE_DEFAULT_SKIP_TESTS[@]:+${GCE_DEFAULT_SKIP_TESTS[@]}} \
${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \ ${GCE_FLAKY_TESTS[@]:+${GCE_FLAKY_TESTS[@]}} \
${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \ ${GCE_SLOW_TESTS[@]:+${GCE_SLOW_TESTS[@]}} \
)"} )"}
: ${JENKINS_PUBLISHED_VERSION:="${CURRENT_RELEASE_PUBLISHED_VERSION}"} : ${JENKINS_PUBLISHED_VERSION:="ci/latest-1.1"}
: ${KUBE_GCE_INSTANCE_PREFIX="e2e-gce-current-release"} : ${KUBE_GCE_INSTANCE_PREFIX="e2e-gce-1-1"}
: ${KUBE_GCS_STAGING_PATH_SUFFIX:="current-release"} : ${KUBE_GCS_STAGING_PATH_SUFFIX:="release-1.1"}
: ${PROJECT:="k8s-jkns-e2e-gce-release"} : ${PROJECT:="k8s-jkns-e2e-gce-release"}
: ${ENABLE_DEPLOYMENTS:=true} : ${ENABLE_DEPLOYMENTS:=true}
;; ;;
# Runs "disruptive" tests on GCE sequentially, against the latest current # Runs "disruptive" tests on GCE on the release candidate branch,
# release ci. # sequentially, against the latest 1.1 ci release.
kubernetes-e2e-gce-disruptive-current-release) kubernetes-e2e-gce-disruptive-1.1)
: ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-disruptive-current-release"} : ${E2E_CLUSTER_NAME:="jenkins-gce-e2e-disruptive-1.1"}
: ${E2E_DOWN:="false"} : ${E2E_DOWN:="false"}
: ${E2E_NETWORK:="gce-e2e-disruptive-current-release"} : ${E2E_NETWORK:="gce-e2e-disruptive-1-1"}
: ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \ : ${GINKGO_TEST_ARGS:="--ginkgo.skip=$(join_regex_allow_empty \
${REBOOT_SKIP_TESTS[@]:+${REBOOT_SKIP_TESTS[@]}}\ ${REBOOT_SKIP_TESTS[@]:+${REBOOT_SKIP_TESTS[@]}}\
) --ginkgo.focus=$(join_regex_no_empty \ ) --ginkgo.focus=$(join_regex_no_empty \
@ -650,9 +647,9 @@ case ${JOB_NAME} in
"Autoscaling\sSuite.*via\sreplicationController" \ "Autoscaling\sSuite.*via\sreplicationController" \
"GCE\sL7\sLoadBalancer\sController" "GCE\sL7\sLoadBalancer\sController"
)"} )"}
: ${JENKINS_PUBLISHED_VERSION:="${CURRENT_RELEASE_PUBLISHED_VERSION}"} : ${JENKINS_PUBLISHED_VERSION:="ci/latest-1.1"}
: ${KUBE_GCE_INSTANCE_PREFIX="e2e-gce-disruptive-current-release"} : ${KUBE_GCE_INSTANCE_PREFIX="e2e-gce-disruptive-1-1"}
: ${KUBE_GCS_STAGING_PATH_SUFFIX:="disruptive-current-release"} : ${KUBE_GCS_STAGING_PATH_SUFFIX:="disruptive-1.1"}
# TODO: move into its own project # TODO: move into its own project
: ${PROJECT:="kubernetes-jenkins"} : ${PROJECT:="kubernetes-jenkins"}
: ${ENABLE_DEPLOYMENTS:=true} : ${ENABLE_DEPLOYMENTS:=true}
@ -757,15 +754,13 @@ case ${JOB_NAME} in
)"} )"}
;; ;;
kubernetes-e2e-gke-current-release) kubernetes-e2e-gke-1.1)
: ${DOGFOOD_GCLOUD:="true"} : ${DOGFOOD_GCLOUD:="true"}
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"} : ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
: ${E2E_CLUSTER_NAME:="gke-release-current-release"} : ${E2E_CLUSTER_NAME:="gke-release-1-1"}
: ${E2E_NETWORK:="gke-release-current-release"} : ${E2E_NETWORK:="gke-release-1-1"}
: ${E2E_SET_CLUSTER_API_VERSION:=y} : ${E2E_SET_CLUSTER_API_VERSION:=y}
: ${JENKINS_PUBLISHED_VERSION:="${CURRENT_RELEASE_PUBLISHED_VERSION}"} : ${JENKINS_PUBLISHED_VERSION:="ci/latest-1.1"}
# This project is called ...-1-1 for historic reasons, (it was created
# during the 1.1 release cycle).
: ${PROJECT:="k8s-jkns-e2e-gke-release-1-1"} : ${PROJECT:="k8s-jkns-e2e-gke-release-1-1"}
: ${FAIL_ON_GCP_RESOURCE_LEAK:="true"} : ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
# Note Daemon sets and Deployments are experimental features in 1.1, # Note Daemon sets and Deployments are experimental features in 1.1,
@ -777,6 +772,21 @@ case ${JOB_NAME} in
)"} )"}
;; ;;
kubernetes-e2e-gke-1.1-features)
: ${DOGFOOD_GCLOUD:="true"}
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
: ${E2E_CLUSTER_NAME:="gke-1-1-features"}
: ${E2E_NETWORK:="gke-1-1-features"}
: ${E2E_SET_CLUSTER_API_VERSION:=y}
: ${JENKINS_PUBLISHED_VERSION:="ci/latest-1.1"}
: ${PROJECT:="k8s-jkns-e2e-gke-1-1-features"}
: ${FAIL_ON_GCP_RESOURCE_LEAK:="true"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=GCE\sL7\sLoadBalancer\sController|Job|Horizontal\spod\sautoscaling"}
# At least n1-standard-2 nodes are required for the cluster to
# have enough cpu/ram to run the Horizontal pod autoscaling tests.
MINION_SIZE="n1-standard-2"
;;
# Sets up the GKE soak cluster weekly using the latest CI release. # Sets up the GKE soak cluster weekly using the latest CI release.
kubernetes-soak-weekly-deploy-gke) kubernetes-soak-weekly-deploy-gke)
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"} : ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
@ -1039,18 +1049,18 @@ case ${JOB_NAME} in
)"} )"}
;; ;;
# kubernetes-upgrade-gke-1.0-current-release # kubernetes-upgrade-gke-1.0-1.1
# #
# This suite: # This suite:
# #
# 1. launches a cluster at ci/latest-1.0, # 1. launches a cluster at ci/latest-1.0,
# 2. upgrades the master to CURRENT_RELEASE_PUBLISHED_VERSION # 2. upgrades the master to ci/latest-1.1
# 3. runs ci/latest-1.0 e2es, # 3. runs ci/latest-1.0 e2es,
# 4. upgrades the rest of the cluster, # 4. upgrades the rest of the cluster,
# 5. runs ci/latest-1.0 e2es again, then # 5. runs ci/latest-1.0 e2es again, then
# 6. runs CURRENT_RELEASE_PUBLISHED_VERSION e2es and tears down the cluster. # 6. runs ci/latest-1.1 e2es and tears down the cluster.
kubernetes-upgrade-1.0-current-release-gke-step1-deploy) kubernetes-upgrade-1.0-1.1-gke-step1-deploy)
: ${DOGFOOD_GCLOUD:="true"} : ${DOGFOOD_GCLOUD:="true"}
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"} : ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
: ${E2E_CLUSTER_NAME:="gke-upgrade-1-0"} : ${E2E_CLUSTER_NAME:="gke-upgrade-1-0"}
@ -1063,23 +1073,23 @@ case ${JOB_NAME} in
: ${E2E_DOWN:="false"} : ${E2E_DOWN:="false"}
;; ;;
kubernetes-upgrade-1.0-current-release-gke-step2-upgrade-master) kubernetes-upgrade-1.0-1.1-gke-step2-upgrade-master)
: ${DOGFOOD_GCLOUD:="true"} : ${DOGFOOD_GCLOUD:="true"}
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"} : ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
: ${E2E_CLUSTER_NAME:="gke-upgrade-1-0"} : ${E2E_CLUSTER_NAME:="gke-upgrade-1-0"}
: ${E2E_NETWORK:="gke-upgrade-1-0"} : ${E2E_NETWORK:="gke-upgrade-1-0"}
: ${E2E_OPT:="--check_version_skew=false"} : ${E2E_OPT:="--check_version_skew=false"}
# Use upgrade logic of version we're upgrading to. # Use upgrade logic of version we're upgrading to.
: ${JENKINS_PUBLISHED_VERSION:="${CURRENT_RELEASE_PUBLISHED_VERSION}"} : ${JENKINS_PUBLISHED_VERSION:="ci/latest-1.1"}
: ${JENKINS_FORCE_GET_TARS:=y} : ${JENKINS_FORCE_GET_TARS:=y}
: ${PROJECT:="kubernetes-jenkins-gke-upgrade"} : ${PROJECT:="kubernetes-jenkins-gke-upgrade"}
: ${E2E_UP:="false"} : ${E2E_UP:="false"}
: ${E2E_TEST:="true"} : ${E2E_TEST:="true"}
: ${E2E_DOWN:="false"} : ${E2E_DOWN:="false"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-master --upgrade-target=${CURRENT_RELEASE_PUBLISHED_VERSION}"} : ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-master --upgrade-target=ci/latest-1.1"}
;; ;;
kubernetes-upgrade-1.0-current-release-gke-step3-e2e-old) kubernetes-upgrade-1.0-1.1-gke-step3-e2e-old)
: ${DOGFOOD_GCLOUD:="true"} : ${DOGFOOD_GCLOUD:="true"}
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"} : ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
: ${E2E_CLUSTER_NAME:="gke-upgrade-1-0"} : ${E2E_CLUSTER_NAME:="gke-upgrade-1-0"}
@ -1099,23 +1109,23 @@ case ${JOB_NAME} in
)"} )"}
;; ;;
kubernetes-upgrade-1.0-current-release-gke-step4-upgrade-cluster) kubernetes-upgrade-1.0-1.1-gke-step4-upgrade-cluster)
: ${DOGFOOD_GCLOUD:="true"} : ${DOGFOOD_GCLOUD:="true"}
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"} : ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
: ${E2E_CLUSTER_NAME:="gke-upgrade-1-0"} : ${E2E_CLUSTER_NAME:="gke-upgrade-1-0"}
: ${E2E_NETWORK:="gke-upgrade-1-0"} : ${E2E_NETWORK:="gke-upgrade-1-0"}
: ${E2E_OPT:="--check_version_skew=false"} : ${E2E_OPT:="--check_version_skew=false"}
# Use upgrade logic of version we're upgrading to. # Use upgrade logic of version we're upgrading to.
: ${JENKINS_PUBLISHED_VERSION:="${CURRENT_RELEASE_PUBLISHED_VERSION}"} : ${JENKINS_PUBLISHED_VERSION:="ci/latest-1.1"}
: ${JENKINS_FORCE_GET_TARS:=y} : ${JENKINS_FORCE_GET_TARS:=y}
: ${PROJECT:="kubernetes-jenkins-gke-upgrade"} : ${PROJECT:="kubernetes-jenkins-gke-upgrade"}
: ${E2E_UP:="false"} : ${E2E_UP:="false"}
: ${E2E_TEST:="true"} : ${E2E_TEST:="true"}
: ${E2E_DOWN:="false"} : ${E2E_DOWN:="false"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-cluster --upgrade-target=${CURRENT_RELEASE_PUBLISHED_VERSION}"} : ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-cluster --upgrade-target=ci/latest-1.1"}
;; ;;
kubernetes-upgrade-1.0-current-release-gke-step5-e2e-old) kubernetes-upgrade-1.0-1.1-gke-step5-e2e-old)
: ${DOGFOOD_GCLOUD:="true"} : ${DOGFOOD_GCLOUD:="true"}
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"} : ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
: ${E2E_CLUSTER_NAME:="gke-upgrade-1-0"} : ${E2E_CLUSTER_NAME:="gke-upgrade-1-0"}
@ -1135,16 +1145,16 @@ case ${JOB_NAME} in
)"} )"}
;; ;;
kubernetes-upgrade-1.0-current-release-gke-step6-e2e-new) kubernetes-upgrade-1.0-1.1-gke-step6-e2e-new)
: ${DOGFOOD_GCLOUD:="true"} : ${DOGFOOD_GCLOUD:="true"}
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"} : ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
: ${E2E_CLUSTER_NAME:="gke-upgrade-1-0"} : ${E2E_CLUSTER_NAME:="gke-upgrade-1-0"}
: ${E2E_NETWORK:="gke-upgrade-1-0"} : ${E2E_NETWORK:="gke-upgrade-1-0"}
# TODO(15011): these really shouldn't be (very) version skewed, but because # TODO(15011): these really shouldn't be (very) version skewed, but because
# we have to get CURRENT_RELEASE_PUBLISHED_VERSION again, it could get slightly out of whack. # we have to get ci/latest-1.1 again, it could get slightly out of whack.
: ${E2E_OPT:="--check_version_skew=false"} : ${E2E_OPT:="--check_version_skew=false"}
: ${JENKINS_FORCE_GET_TARS:=y} : ${JENKINS_FORCE_GET_TARS:=y}
: ${JENKINS_PUBLISHED_VERSION:="${CURRENT_RELEASE_PUBLISHED_VERSION}"} : ${JENKINS_PUBLISHED_VERSION:="ci/latest-1.1"}
: ${PROJECT:="kubernetes-jenkins-gke-upgrade"} : ${PROJECT:="kubernetes-jenkins-gke-upgrade"}
: ${E2E_UP:="false"} : ${E2E_UP:="false"}
: ${E2E_TEST:="true"} : ${E2E_TEST:="true"}
@ -1266,18 +1276,18 @@ case ${JOB_NAME} in
: ${NUM_MINIONS:=5} : ${NUM_MINIONS:=5}
;; ;;
# kubernetes-upgrade-gce-1.0-current-release # kubernetes-upgrade-gce-1.0-1.1
# #
# This suite: # This suite:
# #
# 1. launches a cluster at ci/latest-1.0, # 1. launches a cluster at ci/latest-1.0,
# 2. upgrades the master to CURRENT_RELEASE_PUBLISHED_VERSION # 2. upgrades the master to ci/latest-1.1
# 3. runs ci/latest-1.0 e2es, # 3. runs ci/latest-1.0 e2es,
# 4. upgrades the rest of the cluster, # 4. upgrades the rest of the cluster,
# 5. runs ci/latest-1.0 e2es again, then # 5. runs ci/latest-1.0 e2es again, then
# 6. runs CURRENT_RELEASE_PUBLISHED_VERSION e2es and tears down the cluster. # 6. runs ci/latest-1.1 e2es and tears down the cluster.
kubernetes-upgrade-1.0-current-release-gce-step1-deploy) kubernetes-upgrade-1.0-1.1-gce-step1-deploy)
: ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"} : ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"}
: ${E2E_NETWORK:="gce-upgrade-1-0"} : ${E2E_NETWORK:="gce-upgrade-1-0"}
: ${JENKINS_PUBLISHED_VERSION:="ci/latest-1.0"} : ${JENKINS_PUBLISHED_VERSION:="ci/latest-1.0"}
@ -1289,25 +1299,25 @@ case ${JOB_NAME} in
: ${NUM_MINIONS:=5} : ${NUM_MINIONS:=5}
;; ;;
kubernetes-upgrade-1.0-current-release-gce-step2-upgrade-master) kubernetes-upgrade-1.0-1.1-gce-step2-upgrade-master)
: ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"} : ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"}
: ${E2E_NETWORK:="gce-upgrade-1-0"} : ${E2E_NETWORK:="gce-upgrade-1-0"}
: ${E2E_OPT:="--check_version_skew=false"} : ${E2E_OPT:="--check_version_skew=false"}
# Use upgrade logic of version we're upgrading to. # Use upgrade logic of version we're upgrading to.
: ${JENKINS_PUBLISHED_VERSION:="${CURRENT_RELEASE_PUBLISHED_VERSION}"} : ${JENKINS_PUBLISHED_VERSION:="ci/latest-1.1"}
: ${JENKINS_FORCE_GET_TARS:=y} : ${JENKINS_FORCE_GET_TARS:=y}
: ${PROJECT:="k8s-jkns-gce-upgrade"} : ${PROJECT:="k8s-jkns-gce-upgrade"}
: ${E2E_UP:="false"} : ${E2E_UP:="false"}
: ${E2E_TEST:="true"} : ${E2E_TEST:="true"}
: ${E2E_DOWN:="false"} : ${E2E_DOWN:="false"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-master --upgrade-target=${CURRENT_RELEASE_PUBLISHED_VERSION}"} : ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-master --upgrade-target=ci/latest-1.1"}
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"} : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"}
: ${NUM_MINIONS:=5} : ${NUM_MINIONS:=5}
: ${KUBE_ENABLE_DEPLOYMENTS:=true} : ${KUBE_ENABLE_DEPLOYMENTS:=true}
: ${KUBE_ENABLE_DAEMONSETS:=true} : ${KUBE_ENABLE_DAEMONSETS:=true}
;; ;;
kubernetes-upgrade-1.0-current-release-gce-step3-e2e-old) kubernetes-upgrade-1.0-1.1-gce-step3-e2e-old)
: ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"} : ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"}
: ${E2E_NETWORK:="gce-upgrade-1-0"} : ${E2E_NETWORK:="gce-upgrade-1-0"}
: ${E2E_OPT:="--check_version_skew=false"} : ${E2E_OPT:="--check_version_skew=false"}
@ -1326,25 +1336,25 @@ case ${JOB_NAME} in
: ${NUM_MINIONS:=5} : ${NUM_MINIONS:=5}
;; ;;
kubernetes-upgrade-1.0-current-release-gce-step4-upgrade-cluster) kubernetes-upgrade-1.0-1.1-gce-step4-upgrade-cluster)
: ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"} : ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"}
: ${E2E_NETWORK:="gce-upgrade-1-0"} : ${E2E_NETWORK:="gce-upgrade-1-0"}
: ${E2E_OPT:="--check_version_skew=false"} : ${E2E_OPT:="--check_version_skew=false"}
# Use upgrade logic of version we're upgrading to. # Use upgrade logic of version we're upgrading to.
: ${JENKINS_PUBLISHED_VERSION:="${CURRENT_RELEASE_PUBLISHED_VERSION}"} : ${JENKINS_PUBLISHED_VERSION:="ci/latest-1.1"}
: ${JENKINS_FORCE_GET_TARS:=y} : ${JENKINS_FORCE_GET_TARS:=y}
: ${PROJECT:="k8s-jkns-gce-upgrade"} : ${PROJECT:="k8s-jkns-gce-upgrade"}
: ${E2E_UP:="false"} : ${E2E_UP:="false"}
: ${E2E_TEST:="true"} : ${E2E_TEST:="true"}
: ${E2E_DOWN:="false"} : ${E2E_DOWN:="false"}
: ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-cluster --upgrade-target=${CURRENT_RELEASE_PUBLISHED_VERSION}"} : ${GINKGO_TEST_ARGS:="--ginkgo.focus=Skipped.*Cluster\supgrade.*upgrade-cluster --upgrade-target=ci/latest-1.1"}
: ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"} : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"}
: ${NUM_MINIONS:=5} : ${NUM_MINIONS:=5}
: ${KUBE_ENABLE_DEPLOYMENTS:=true} : ${KUBE_ENABLE_DEPLOYMENTS:=true}
: ${KUBE_ENABLE_DAEMONSETS:=true} : ${KUBE_ENABLE_DAEMONSETS:=true}
;; ;;
kubernetes-upgrade-1.0-current-release-gce-step5-e2e-old) kubernetes-upgrade-1.0-1.1-gce-step5-e2e-old)
: ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"} : ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"}
: ${E2E_NETWORK:="gce-upgrade-1-0"} : ${E2E_NETWORK:="gce-upgrade-1-0"}
: ${E2E_OPT:="--check_version_skew=false"} : ${E2E_OPT:="--check_version_skew=false"}
@ -1363,14 +1373,14 @@ case ${JOB_NAME} in
: ${NUM_MINIONS:=5} : ${NUM_MINIONS:=5}
;; ;;
kubernetes-upgrade-1.0-current-release-gce-step6-e2e-new) kubernetes-upgrade-1.0-1.1-gce-step6-e2e-new)
: ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"} : ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"}
: ${E2E_NETWORK:="gce-upgrade-1-0"} : ${E2E_NETWORK:="gce-upgrade-1-0"}
# TODO(15011): these really shouldn't be (very) version skewed, but because # TODO(15011): these really shouldn't be (very) version skewed, but because
# we have to get CURRENT_RELEASE_PUBLISHED_VERSION again, it could get slightly out of whack. # we have to get ci/latest-1.1 again, it could get slightly out of whack.
: ${E2E_OPT:="--check_version_skew=false"} : ${E2E_OPT:="--check_version_skew=false"}
: ${JENKINS_FORCE_GET_TARS:=y} : ${JENKINS_FORCE_GET_TARS:=y}
: ${JENKINS_PUBLISHED_VERSION:="${CURRENT_RELEASE_PUBLISHED_VERSION}"} : ${JENKINS_PUBLISHED_VERSION:="ci/latest-1.1"}
: ${PROJECT:="k8s-jkns-gce-upgrade"} : ${PROJECT:="k8s-jkns-gce-upgrade"}
: ${E2E_UP:="false"} : ${E2E_UP:="false"}
: ${E2E_TEST:="true"} : ${E2E_TEST:="true"}