Skip to content

[btlr] testing: use NUM_TEST_WORKERS env var #4030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tmatsuo merged 6 commits into from
Jun 12, 2020
Merged

[btlr] testing: use NUM_TEST_WORKERS env var #4030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
772e8e7
[btlr] testing: use NUM_TEST_WORKERS env var
Jun 9, 2020
597cdd0
use 10 workers
Jun 10, 2020
d31b025
use only 1 worker for py-2.7 builds
Jun 11, 2020
e10b0b7
20 workers
Jun 11, 2020
91a8ed4
10 workers
Jun 12, 2020
fe6c8fb
wait 5 mins in py-3.8 presubmit build to avoid quota errors
Jun 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .kokoro/python3.6/common.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ env_vars: {
value: "python-docs-samples-tests-py36"
}

# Number of test workers.
env_vars: {
key: "NUM_TEST_WORKERS"
value: "10"
}

env_vars: {
key: "TRAMPOLINE_DOCKERFILE"
value: ".kokoro/docker/Dockerfile"
Expand Down
6 changes: 6 additions & 0 deletions .kokoro/python3.7/common.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ env_vars: {
value: "python-docs-samples-tests-py37"
}

# Number of test workers.
env_vars: {
key: "NUM_TEST_WORKERS"
value: "10"
}

env_vars: {
key: "TRAMPOLINE_DOCKERFILE"
value: ".kokoro/docker/Dockerfile"
Expand Down
6 changes: 6 additions & 0 deletions .kokoro/python3.8/common.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ env_vars: {
value: "python-docs-samples-tests-py38"
}

# Number of test workers.
env_vars: {
key: "NUM_TEST_WORKERS"
value: "10"
}

env_vars: {
key: "TRAMPOLINE_DOCKERFILE"
value: ".kokoro/docker/Dockerfile"
Expand Down
22 changes: 20 additions & 2 deletions .kokoro/tests/run_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,19 @@ if [[ $* == *--only-diff-head* ]]; then
fi
fi

# Because Kokoro runs presubmit builds simalteneously, we often see
# quota related errors. I think we can avoid this by changing the
# order of tests to execute (e.g. reverse order for py-3.8
# build). Currently there's no easy way to do that with btlr, so we
# temporarily wait few minutes to avoid quota issue for py-3.8
# presubmit build.
if [[ "${RUN_TESTS_SESSION}" == "py-3.8" ]] \
&& [[ "${KOKORO_JOB_NAME}" == *presubmit ]]; then
echo -n "Detected py-3.8 presubmit build,"
echo "Wait few minutes to avoid quota issues."
sleep 5m
fi

if [[ -z "${PROJECT_ROOT:-}" ]]; then
PROJECT_ROOT="github/python-docs-samples"
fi
Expand Down Expand Up @@ -108,10 +121,15 @@ test_prog="${PROJECT_ROOT}/.kokoro/tests/run_single_test.sh"
btlr_args=(
"run"
"**/requirements.txt"
"--max-concurrency"
"30"
)

if [[ -n "${NUM_TEST_WORKERS:-}" ]]; then
btlr_args+=(
"--max-concurrency"
"${NUM_TEST_WORKERS}"
)
fi

if [[ -n "${DIFF_FROM:-}" ]]; then
btlr_args+=(
"--git-diff"
Expand Down