Skip to content

K
k3s
Commit 2c038e38 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

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

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.
parents 97a7d009 20e220e5
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
hack/jenkins/e2e-runner.sh
View file @ 2c038e38
......@@ -342,9 +342,10 @@ if [[ -n "${JENKINS_PUBLISHED_SKEW_VERSION:-}" ]]; then
if [[ "${JENKINS_USE_SKEW_TESTS:-}" != "true" ]]; then
# Back out into the old tests now that we've downloaded & maybe upgraded.
cd ../kubernetes_old
elif [[ "${JENKINS_USE_SKEW_KUBECTL:-}" == "true" ]]; then
# Append kubectl-path of skewed kubectl to test args
GINKGO_TEST_ARGS="${GINKGO_TEST_ARGS:-} --kubectl-path=$(pwd)/../kubernetes/cluster/kubectl.sh"
if [[ "${JENKINS_USE_SKEW_KUBECTL:-}" == "true" ]]; then
# Append kubectl-path of skewed kubectl to test args
GINKGO_TEST_ARGS="${GINKGO_TEST_ARGS:-} --kubectl-path=$(pwd)/../kubernetes/cluster/kubectl.sh"
fi
fi
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment