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

Merge pull request #15147 from gmarek/fix-jenkins

Browse Source 
Unset NUM_MINIONS variable in Kubemark Jenkins run, to allow use of Kubemark default
This commit is contained in:
Marek Grabowski 2015-10-06 10:35:33 +02:00
commit fbd0c93eac
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hack/jenkins/e2e.sh
View File

@ -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
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