github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

jenkins: Set '--nodes' when 'GINKGO_PARALLEL' is set. 

By default, if 'GINKGO_PARALLEL' is true, then '--nodes=$GINKGO_PARALLEL_NODES'
will be passed. The default 'GINKGO_PARALLEL_NODES' is 30.
pull/6/head
Yifan Gu 2016-01-12 17:45:23 -08:00
parent 3f2e99b7e7
commit eb9c5ae59e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hack/ginkgo-e2e.sh
View File

@ -81,8 +81,10 @@ if [[ -n "${CONFORMANCE_TEST_SKIP_REGEX:-}" ]]; then
ginkgo_args+=("--skip=${CONFORMANCE_TEST_SKIP_REGEX}") ginkgo_args+=("--skip=${CONFORMANCE_TEST_SKIP_REGEX}")
ginkgo_args+=("--seed=1436380640") ginkgo_args+=("--seed=1436380640")
fi fi
if [[ ${GINKGO_PARALLEL} =~ ^[yY]$ ]]; then if [[ -n "${GINKGO_PARALLEL_NODES:-}" ]]; then
ginkgo_args+=("-p") ginkgo_args+=("--nodes=${GINKGO_PARALLEL_NODES}")
elif [[ ${GINKGO_PARALLEL} =~ ^[yY]$ ]]; then
ginkgo_args+=("--nodes=30") # By default, set --nodes=30.
fi fi

1
hack/jenkins/e2e.sh
View File

@ -1101,6 +1101,7 @@ export E2E_DOWN="${E2E_DOWN:-true}"
export E2E_CLEAN_START="${E2E_CLEAN_START:-}" export E2E_CLEAN_START="${E2E_CLEAN_START:-}"
# Used by hack/ginkgo-e2e.sh to enable ginkgo's parallel test runner. # Used by hack/ginkgo-e2e.sh to enable ginkgo's parallel test runner.
export GINKGO_PARALLEL=${GINKGO_PARALLEL:-} export GINKGO_PARALLEL=${GINKGO_PARALLEL:-}
export GINKGO_PARALLEL_NODES=${GINKGO_PARALLEL_NODES:-}
export GINKGO_TEST_ARGS="${GINKGO_TEST_ARGS:-}" export GINKGO_TEST_ARGS="${GINKGO_TEST_ARGS:-}"
# If we are on PR Jenkins merging into master, use the local e2e.sh. Otherwise, use the latest on github. # If we are on PR Jenkins merging into master, use the local e2e.sh. Otherwise, use the latest on github.