diff options
-rw-r--r-- | tools/internal_ci/linux/grpc_sanity.cfg | 2 | ||||
-rw-r--r-- | tools/internal_ci/linux/pull_request/grpc_sanity.cfg (renamed from tools/internal_ci/linux/grpc_sanity_webhook_test.cfg) | 4 | ||||
-rwxr-xr-x | tools/run_tests/run_tests_matrix.py | 11 |
3 files changed, 13 insertions, 4 deletions
diff --git a/tools/internal_ci/linux/grpc_sanity.cfg b/tools/internal_ci/linux/grpc_sanity.cfg index e06a2f4241..0f83299aab 100644 --- a/tools/internal_ci/linux/grpc_sanity.cfg +++ b/tools/internal_ci/linux/grpc_sanity.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests linux sanity opt --inner_jobs 16 -j 1 --internal_ci" + value: "-f basictests linux sanity --inner_jobs 16 -j 1 --internal_ci" } diff --git a/tools/internal_ci/linux/grpc_sanity_webhook_test.cfg b/tools/internal_ci/linux/pull_request/grpc_sanity.cfg index 24e7984f3a..0f83299aab 100644 --- a/tools/internal_ci/linux/grpc_sanity_webhook_test.cfg +++ b/tools/internal_ci/linux/pull_request/grpc_sanity.cfg @@ -16,7 +16,7 @@ # Location of the continuous shell script in repository. build_file: "grpc/tools/internal_ci/linux/grpc_run_tests_matrix.sh" -timeout_mins: 20 +timeout_mins: 40 action { define_artifacts { regex: "**/*sponge_log.xml" @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests linux sanity opt --inner_jobs 16 -j 1 --internal_ci" + value: "-f basictests linux sanity --inner_jobs 16 -j 1 --internal_ci" } diff --git a/tools/run_tests/run_tests_matrix.py b/tools/run_tests/run_tests_matrix.py index 1c99e794a9..005c735a22 100755 --- a/tools/run_tests/run_tests_matrix.py +++ b/tools/run_tests/run_tests_matrix.py @@ -164,9 +164,18 @@ def _generate_jobs(languages, def _create_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS): test_jobs = [] + # sanity tests + test_jobs += _generate_jobs( + languages=['sanity'], + configs=['dbg', 'opt'], + platforms=['linux'], + labels=['basictests'], + extra_args=extra_args, + inner_jobs=inner_jobs) + # supported on linux only test_jobs += _generate_jobs( - languages=['sanity', 'php7'], + languages=['php7'], configs=['dbg', 'opt'], platforms=['linux'], labels=['basictests', 'multilang'], |