scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6751 from wojtek-t/jenkins_for_scalability

Browse Source 
Prepare for running scalability test on Jenkins
This commit is contained in:
Quinton Hoole
2015-04-13 07:53:50 -07:00
parent a531a465d1 f7fbc2d0c5
commit 15efb17a0c
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
hack/jenkins/e2e.sh
View File

@@ -37,6 +37,21 @@ else
export HOME=${WORKSPACE} # Nothing should want Jenkins $HOME export HOME=${WORKSPACE} # Nothing should want Jenkins $HOME
fi fi
# Additional parameters that are passed to ginkgo runner.
GINKGO_TEST_ARGS=""
if [[ "${SCALABILITY:-}" == "true" ]]; then
export MASTER_SIZE="n1-standard-4"
# TODO(wojtek-t): Once we have enough quota for the project, increase
# NUM_MINIONS to 100 (which is our v1.0 goal).
export NUM_MINIONS="10"
GINKGO_TEST_ARGS="--ginkgo.focus=Density "
else
export MASTER_SIZE="g1-small"
export NUM_MINIONS="2"
fi
# Unlike the kubernetes-build script, we expect some environment # Unlike the kubernetes-build script, we expect some environment
# variables to be set. We echo these immediately and presume "set -o # variables to be set. We echo these immediately and presume "set -o
# nounset" will force the caller to set them: (The first several are # nounset" will force the caller to set them: (The first several are
@@ -111,7 +126,7 @@ go run ./hack/e2e.go -v --ctl="version --match-server-version=false"
### Run tests ### ### Run tests ###
# Jenkins will look at the junit*.xml files for test failures, so don't exit # Jenkins will look at the junit*.xml files for test failures, so don't exit
# with a nonzero error code if it was only tests that failed. # with a nonzero error code if it was only tests that failed.
go run ./hack/e2e.go ${E2E_OPT} -v --test --test_args="--ginkgo.noColor" || true go run ./hack/e2e.go ${E2E_OPT} -v --test --test_args="${GINKGO_TEST_ARGS}--ginkgo.noColor" || true
### Clean up ### ### Clean up ###
go run ./hack/e2e.go ${E2E_OPT} -v --down go run ./hack/e2e.go ${E2E_OPT} -v --down