Skip to content

K
k3s
Commit fbd0c93e authored by Marek Grabowski's avatar Marek Grabowski
Browse files
Options

Merge pull request #15147 from gmarek/fix-jenkins

Unset NUM_MINIONS variable in Kubemark Jenkins run, to allow use of Kubemark default
parents 107d0f6d 393d8f08
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
hack/jenkins/e2e.sh
View file @ fbd0c93e
...@@ -845,6 +845,9 @@ fi ...@@ -845,6 +845,9 @@ fi
### Start Kubemark ### ### Start Kubemark ###
if [[ "${USE_KUBEMARK:-}" == "true" ]]; then if [[ "${USE_KUBEMARK:-}" == "true" ]]; then
export RUN_FROM_DISTRO=true export RUN_FROM_DISTRO=true
NUM_MINIONS_BKP=${NUM_MINIONS}
# We need to unset NUM_MINIONS to be able to use kubemark default settings.
unset NUM_MINIONS
./test/kubemark/stop-kubemark.sh ./test/kubemark/stop-kubemark.sh
./test/kubemark/start-kubemark.sh ./test/kubemark/start-kubemark.sh
./test/kubemark/run-scalability-test.sh && exitcode=0 || exitcode=$? ./test/kubemark/run-scalability-test.sh && exitcode=0 || exitcode=$?
...@@ -855,6 +858,8 @@ if [[ "${USE_KUBEMARK:-}" == "true" ]]; then ...@@ -855,6 +858,8 @@ if [[ "${USE_KUBEMARK:-}" == "true" ]]; then
fi fi
./test/kubemark/stop-kubemark.sh ./test/kubemark/stop-kubemark.sh
unset RUN_FROM_DISTRO unset RUN_FROM_DISTRO
NUM_MINIONS=${NUM_MINIONS_BKP}
unset NUM_MINIONS_BKP
fi fi
# TODO(zml): We have a bunch of legacy Jenkins configs that are # TODO(zml): We have a bunch of legacy Jenkins configs that are
......
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