From 3cec929f1cd93d6b9c4649b57e2dff5f6a9434a7 Mon Sep 17 00:00:00 2001 From: Isaac Hollander McCreery Date: Tue, 9 Feb 2016 16:31:10 -0800 Subject: [PATCH] Remove old GCE upgrade jobs; no longer useful --- hack/jenkins/e2e.sh | 103 -------------------------------------------- 1 file changed, 103 deletions(-) diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index 47fcdd7a3dd..f57f9e63961 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -740,109 +740,6 @@ case ${JOB_NAME} in kubernetes-upgrade-gce-1.1-master-step7-e2e-new) configure_upgrade_step 'configured-in-release-1.1' 'ci/latest' 'upgrade-gce-1-1-master' 'k8s-jkns-gce-upgrade' ;; - - # kubernetes-upgrade-gce-1.0-current-release - # - # This suite: - # - # 1. launches a cluster at ci/latest-1.0, - # 2. upgrades the master to CURRENT_RELEASE_PUBLISHED_VERSION - # 3. runs ci/latest-1.0 e2es, - # 4. upgrades the rest of the cluster, - # 5. runs ci/latest-1.0 e2es again, then - # 6. runs CURRENT_RELEASE_PUBLISHED_VERSION e2es and tears down the cluster. - - kubernetes-upgrade-1.0-current-release-gce-step1-deploy) - : ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"} - : ${E2E_NETWORK:="gce-upgrade-1-0"} - : ${JENKINS_PUBLISHED_VERSION:="ci/latest-1.0"} - : ${PROJECT:="k8s-jkns-gce-upgrade"} - : ${E2E_UP:="true"} - : ${E2E_TEST:="false"} - : ${E2E_DOWN:="false"} - : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"} - : ${NUM_NODES:=5} - ;; - - kubernetes-upgrade-1.0-current-release-gce-step2-upgrade-master) - : ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"} - : ${E2E_NETWORK:="gce-upgrade-1-0"} - : ${E2E_OPT:="--check_version_skew=false"} - # Use upgrade logic of version we're upgrading to. - : ${JENKINS_PUBLISHED_VERSION:="${CURRENT_RELEASE_PUBLISHED_VERSION}"} - : ${JENKINS_FORCE_GET_TARS:=y} - : ${PROJECT:="k8s-jkns-gce-upgrade"} - : ${E2E_UP:="false"} - : ${E2E_TEST:="true"} - : ${E2E_DOWN:="false"} - : ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Feature:Upgrade\].*upgrade-master --upgrade-target=${CURRENT_RELEASE_PUBLISHED_VERSION}"} - : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"} - : ${NUM_NODES:=5} - : ${KUBE_ENABLE_DAEMONSETS:=true} - ;; - - kubernetes-upgrade-1.0-current-release-gce-step3-e2e-old) - : ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"} - : ${E2E_NETWORK:="gce-upgrade-1-0"} - : ${E2E_OPT:="--check_version_skew=false"} - : ${JENKINS_FORCE_GET_TARS:=y} - # Run old e2es - : ${JENKINS_PUBLISHED_VERSION:="ci/latest-1.0"} - : ${PROJECT:="k8s-jkns-gce-upgrade"} - : ${E2E_UP:="false"} - : ${E2E_TEST:="true"} - : ${E2E_DOWN:="false"} - : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"} - : ${NUM_NODES:=5} - ;; - - kubernetes-upgrade-1.0-current-release-gce-step4-upgrade-cluster) - : ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"} - : ${E2E_NETWORK:="gce-upgrade-1-0"} - : ${E2E_OPT:="--check_version_skew=false"} - # Use upgrade logic of version we're upgrading to. - : ${JENKINS_PUBLISHED_VERSION:="${CURRENT_RELEASE_PUBLISHED_VERSION}"} - : ${JENKINS_FORCE_GET_TARS:=y} - : ${PROJECT:="k8s-jkns-gce-upgrade"} - : ${E2E_UP:="false"} - : ${E2E_TEST:="true"} - : ${E2E_DOWN:="false"} - : ${GINKGO_TEST_ARGS:="--ginkgo.focus=\[Feature:Upgrade\].*upgrade-cluster --upgrade-target=${CURRENT_RELEASE_PUBLISHED_VERSION}"} - : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"} - : ${NUM_NODES:=5} - : ${KUBE_ENABLE_DAEMONSETS:=true} - ;; - - kubernetes-upgrade-1.0-current-release-gce-step5-e2e-old) - : ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"} - : ${E2E_NETWORK:="gce-upgrade-1-0"} - : ${E2E_OPT:="--check_version_skew=false"} - : ${JENKINS_FORCE_GET_TARS:=y} - # Run old e2es - : ${JENKINS_PUBLISHED_VERSION:="ci/latest-1.0"} - : ${PROJECT:="k8s-jkns-gce-upgrade"} - : ${E2E_UP:="false"} - : ${E2E_TEST:="true"} - : ${E2E_DOWN:="false"} - : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"} - : ${NUM_NODES:=5} - ;; - - kubernetes-upgrade-1.0-current-release-gce-step6-e2e-new) - : ${E2E_CLUSTER_NAME:="gce-upgrade-1-0"} - : ${E2E_NETWORK:="gce-upgrade-1-0"} - # 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. - : ${E2E_OPT:="--check_version_skew=false"} - : ${JENKINS_FORCE_GET_TARS:=y} - : ${JENKINS_PUBLISHED_VERSION:="${CURRENT_RELEASE_PUBLISHED_VERSION}"} - : ${PROJECT:="k8s-jkns-gce-upgrade"} - : ${E2E_UP:="false"} - : ${E2E_TEST:="true"} - : ${E2E_DOWN:="true"} - : ${KUBE_GCE_INSTANCE_PREFIX:="e2e-upgrade-1-0"} - : ${NUM_NODES:=5} - ;; esac # Skip gcloud update checking