github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #25817 from ihmccreery/fix-skew-kubectl

Browse Source 
Automatic merge from submit-queue

Fix JENKINS_USE_SKEW_KUBECTL

I got this logic wrong; the first is a NOT comparison, so the second should only be available if that NOT comparison returns true.
This commit is contained in:
k8s-merge-robot 2016-05-20 04:42:19 -07:00
commit 2c038e38c5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -342,11 +342,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
elif [[ "${JENKINS_USE_SKEW_KUBECTL:-}" == "true" ]]; then if [[ "${JENKINS_USE_SKEW_KUBECTL:-}" == "true" ]]; then
# Append kubectl-path of skewed kubectl to test args # Append kubectl-path of skewed kubectl to test args
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:-}"