github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #26789 from ihmccreery/always-skew-client

Browse Source 
Automatic merge from submit-queue

Always skew the client when running version-skew tests

As mentioned in the comments:

- 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).

So, remove gate on `JENKINS_USE_SKEW_KUBECTL`, and always use the skewed `kubectl`.

This should go in before https://github.com/kubernetes/test-infra/pull/109.
This commit is contained in:
k8s-merge-robot 2016-06-06 23:08:44 -07:00
commit 72b1be9c76
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
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,10 +351,12 @@ 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:
GINKGO_TEST_ARGS="${GINKGO_TEST_ARGS:-} --kubectl-path=$(pwd)/../kubernetes/cluster/kubectl.sh" #
fi # - 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"
fi fi
fi fi