From 0976ed59c9b8d905633c6c08446a05278753d514 Mon Sep 17 00:00:00 2001 From: Joe Finney Date: Tue, 8 Mar 2016 15:30:57 -0800 Subject: [PATCH] Remove hack/e2e-internal/e2e-upgrade.sh. --- hack/e2e-internal/e2e-upgrade.sh | 32 -------------------------------- test/e2e/cluster_upgrade.go | 4 ++-- 2 files changed, 2 insertions(+), 34 deletions(-) delete mode 100755 hack/e2e-internal/e2e-upgrade.sh diff --git a/hack/e2e-internal/e2e-upgrade.sh b/hack/e2e-internal/e2e-upgrade.sh deleted file mode 100755 index 6119b3c27cb..00000000000 --- a/hack/e2e-internal/e2e-upgrade.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# Copyright 2015 The Kubernetes Authors All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -o errexit -set -o nounset -set -o pipefail - -KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../.. - -: ${KUBECTL:=${KUBE_ROOT}/cluster/kubectl.sh} -: ${KUBE_CONFIG_FILE:="config-test.sh"} - -export KUBECTL KUBE_CONFIG_FILE - -source "${KUBE_ROOT}/cluster/kube-util.sh" - -prepare-e2e - -"${KUBE_ROOT}/cluster/${KUBERNETES_PROVIDER}/upgrade.sh" $@ diff --git a/test/e2e/cluster_upgrade.go b/test/e2e/cluster_upgrade.go index e22c43eaa56..c9a6da68780 100644 --- a/test/e2e/cluster_upgrade.go +++ b/test/e2e/cluster_upgrade.go @@ -61,7 +61,7 @@ var masterUpgrade = func(v string) error { func masterUpgradeGCE(rawV string) error { v := "v" + rawV - _, _, err := runCmd(path.Join(testContext.RepoRoot, "hack/e2e-internal/e2e-upgrade.sh"), "-M", v) + _, _, err := runCmd(path.Join(testContext.RepoRoot, "cluster/gce/upgrade.sh"), "-M", v) return err } @@ -111,7 +111,7 @@ func nodeUpgradeGCE(rawV string) error { // would trigger a node update; right now it's very different. v := "v" + rawV Logf("Preparing node upgrade by creating new instance template for %q", v) - stdout, _, err := runCmd(path.Join(testContext.RepoRoot, "hack/e2e-internal/e2e-upgrade.sh"), "-P", v) + stdout, _, err := runCmd(path.Join(testContext.RepoRoot, "cluster/gce/upgrade.sh"), "-P", v) if err != nil { return err }