scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 12:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always skew the client when running version-skew tests

Browse Source
This commit is contained in:
Isaac Hollander McCreery
2016-06-03 10:31:23 -07:00
parent 24ddec1cbf
commit 28738ff787
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hack/jenkins/e2e-runner.sh
View File

@@ -336,11 +336,7 @@ fi
# GINKGO_UPGRADE_TESTS_ARGS for the test run. # GINKGO_UPGRADE_TESTS_ARGS for the test run.
# #
# JENKINS_USE_SKEW_TESTS=true will run tests from the skewed version rather # JENKINS_USE_SKEW_TESTS=true will run tests from the skewed version rather
# than the original version; it is mutuall exclusive with # than the original version.
# JENKINS_USE_SKEW_KUBECTL.
#
# JENKINS_USE_SKEW_KUBECTL=true will use the skewed version of Kubectl; it is
# mutually exclusive with JENKINS_USE_SKEW_TESTS.
if [[ -n "${JENKINS_PUBLISHED_SKEW_VERSION:-}" ]]; then if [[ -n "${JENKINS_PUBLISHED_SKEW_VERSION:-}" ]]; then
cd .. cd ..
mv kubernetes kubernetes_old mv kubernetes kubernetes_old
@@ -355,12 +351,14 @@ if [[ -n "${JENKINS_PUBLISHED_SKEW_VERSION:-}" ]]; then
if [[ "${JENKINS_USE_SKEW_TESTS:-}" != "true" ]]; then if [[ "${JENKINS_USE_SKEW_TESTS:-}" != "true" ]]; then
# Back out into the old tests now that we've downloaded & maybe upgraded. # Back out into the old tests now that we've downloaded & maybe upgraded.
cd ../kubernetes_old cd ../kubernetes_old
if [[ "${JENKINS_USE_SKEW_KUBECTL:-}" == "true" ]]; then # Append kubectl-path of skewed kubectl to test args, since we always
# Append kubectl-path of skewed kubectl to test args # want that to use the skewed kubectl version:
#
# - for upgrade jobs, we want kubectl to be at the same version as master.
# - for client skew tests, we want to use the skewed kubectl (that's what we're testing).
GINKGO_TEST_ARGS="${GINKGO_TEST_ARGS:-} --kubectl-path=$(pwd)/../kubernetes/cluster/kubectl.sh" GINKGO_TEST_ARGS="${GINKGO_TEST_ARGS:-} --kubectl-path=$(pwd)/../kubernetes/cluster/kubectl.sh"
fi fi
fi fi
fi
if [[ "${E2E_TEST,,}" == "true" ]]; then if [[ "${E2E_TEST,,}" == "true" ]]; then
e2e_test "${GINKGO_TEST_ARGS:-}" e2e_test "${GINKGO_TEST_ARGS:-}"