From b999e6655c2140f09e38b45b8d015ecae3437029 Mon Sep 17 00:00:00 2001 From: Filip Grzadkowski Date: Mon, 8 Jun 2015 13:51:24 +0200 Subject: [PATCH] Do not overwrite bash variables in jenkins for scalability tests --- hack/jenkins/e2e.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index ad9367cf798..9d628864340 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -42,19 +42,19 @@ GINKGO_TEST_ARGS=${GINKGO_TEST_ARGS:-""} if [[ "${PERFORMANCE:-}" == "true" ]]; then if [[ "${KUBERNETES_PROVIDER}" == "aws" ]]; then - export MASTER_SIZE="m3.xlarge" + export MASTER_SIZE=${MASTER_SIZE:-"m3.xlarge"} else - export MASTER_SIZE="n1-standard-4" + export MASTER_SIZE=${MASTER_SIZE:-"n1-standard-4"} fi - export NUM_MINIONS="100" - GINKGO_TEST_ARGS="--ginkgo.focus=\[Performance suite\] " + export NUM_MINIONS=${NUM_MINIONS:-"100"} + GINKGO_TEST_ARGS=${GINKGO_TEST_ARGS:-"--ginkgo.focus=\[Performance suite\] "} else if [[ "${KUBERNETES_PROVIDER}" == "aws" ]]; then - export MASTER_SIZE="t2.small" + export MASTER_SIZE=${MASTER_SIZE:-"t2.small"} else - export MASTER_SIZE="g1-small" + export MASTER_SIZE=${MASTER_SIZE:-"g1-small"} fi - export NUM_MINIONS="2" + export NUM_MINIONS=${NUM_MINIONS:-"2"} fi