e2e test cluster stability during upgrade

This commit is contained in:
Mike Danese
2015-06-08 18:59:13 -07:00
parent 93038de0ee
commit de55e17f75
5 changed files with 205 additions and 8 deletions

View File

@@ -31,4 +31,4 @@ source "${KUBE_VERSION_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh"
prepare-e2e
"${KUBE_VERSION_ROOT}/cluster/kube-push.sh"
"${KUBE_VERSION_ROOT}/cluster/kube-push.sh" $@

View File

@@ -0,0 +1,34 @@
#!/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}")/../..
: ${KUBE_VERSION_ROOT:=${KUBE_ROOT}}
: ${KUBECTL:=${KUBE_VERSION_ROOT}/cluster/kubectl.sh}
: ${KUBE_CONFIG_FILE:="config-test.sh"}
export KUBECTL KUBE_CONFIG_FILE
source "${KUBE_ROOT}/cluster/kube-env.sh"
source "${KUBE_VERSION_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh"
prepare-e2e
"${KUBE_VERSION_ROOT}/cluster/${KUBERNETES_PROVIDER}/upgrade.sh" $@

View File

@@ -14,15 +14,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# Provide reasonable default for running the end-to-end tests against a recent
# stable release and then again after upgrading it to a version built from head.
# This runs e2e, does a checked upgrade of the MASTER using the locally built release, then runs e2e again.
go run "$(dirname $0)/e2e.go" -v -build -up -version="v0.14.0" -test -check_version_skew=false
if [ $? -eq 0 ]; then
echo "Tests on initial version succeeded. Proceeding with push and second set of tests."
go run "$(dirname $0)/e2e.go" -v -push -version="" -test -check_version_skew=false
echo "Tests on initial version succeeded. Running the checked master upgrade."
go run "$(dirname $0)/e2e.go" -v --test --test_args='--ginkgo.focus=Skipped.*Cluster\supgrade.*gce-upgrade' -check_version_skew=false
else
echo "Tests on initial version failed. Skipping tests on second version."
fi
echo "Master upgrade complete. Running e2e on the upgraded cluster."
go run "$(dirname $0)/e2e.go" -v -build -up -version="" -test -check_version_skew=false
exit $?