From b056bc41d3c0299f0aacb2880d54d426df9add4e Mon Sep 17 00:00:00 2001 From: AJ Heller Date: Mon, 29 Jul 2024 11:47:03 -0700 Subject: [PATCH] [test] Remove deprecated flag from run_tests* scripts (#37261) `--internal_ci` has been deprecated and unused for 6 years. https://github.com/grpc/grpc/pull/16635 Closes #37261 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/37261 from drfloob:rm-internal-ci-flag 486eb1cc44316ac069ce86ba7ba024a527ef1933 PiperOrigin-RevId: 657276079 --- .../internal_ci/linux/arm64/grpc_basictests_csharp.cfg | 2 +- tools/internal_ci/linux/arm64/grpc_basictests_php.cfg | 2 +- .../internal_ci/linux/arm64/grpc_basictests_python.cfg | 2 +- tools/internal_ci/linux/arm64/grpc_basictests_ruby.cfg | 2 +- tools/internal_ci/linux/grpc_basictests_c_cpp_dbg.cfg | 2 +- tools/internal_ci/linux/grpc_basictests_c_cpp_opt.cfg | 2 +- tools/internal_ci/linux/grpc_basictests_csharp.cfg | 2 +- tools/internal_ci/linux/grpc_basictests_php.cfg | 2 +- tools/internal_ci/linux/grpc_basictests_python.cfg | 2 +- tools/internal_ci/linux/grpc_basictests_ruby.cfg | 2 +- .../internal_ci/linux/grpc_build_submodule_at_head.sh | 2 +- tools/internal_ci/linux/grpc_clang_tidy.cfg | 2 +- tools/internal_ci/linux/grpc_interop_alts.cfg | 2 +- tools/internal_ci/linux/grpc_interop_tocloud.cfg | 2 +- tools/internal_ci/linux/grpc_interop_toprod.cfg | 2 +- tools/internal_ci/linux/grpc_portability.cfg | 2 +- tools/internal_ci/linux/grpc_pull_request_sanity.cfg | 2 +- tools/internal_ci/linux/grpc_sanity.cfg | 2 +- .../linux/pull_request/grpc_basictests_csharp.cfg | 2 +- .../linux/pull_request/grpc_basictests_php.cfg | 2 +- .../linux/pull_request/grpc_basictests_python.cfg | 2 +- .../linux/pull_request/grpc_basictests_ruby.cfg | 2 +- .../internal_ci/linux/pull_request/grpc_clang_tidy.cfg | 2 +- tools/internal_ci/linux/pull_request/grpc_sanity.cfg | 2 +- tools/internal_ci/linux/sanitizer/grpc_c_asan.cfg | 2 +- tools/internal_ci/linux/sanitizer/grpc_c_msan.cfg | 2 +- tools/internal_ci/linux/sanitizer/grpc_c_tsan.cfg | 2 +- tools/internal_ci/linux/sanitizer/grpc_c_ubsan.cfg | 2 +- tools/internal_ci/linux/sanitizer/grpc_cpp_asan.cfg | 2 +- tools/internal_ci/linux/sanitizer/grpc_cpp_tsan.cfg | 2 +- .../linux/sanitizer/pull_request/grpc_c_asan.cfg | 2 +- .../linux/sanitizer/pull_request/grpc_c_msan.cfg | 2 +- .../linux/sanitizer/pull_request/grpc_c_tsan.cfg | 2 +- .../linux/sanitizer/pull_request/grpc_c_ubsan.cfg | 2 +- .../linux/sanitizer/pull_request/grpc_cpp_asan.cfg | 2 +- .../linux/sanitizer/pull_request/grpc_cpp_tsan.cfg | 2 +- tools/internal_ci/macos/grpc_basictests_c_cpp_dbg.cfg | 2 +- tools/internal_ci/macos/grpc_basictests_c_cpp_opt.cfg | 2 +- tools/internal_ci/macos/grpc_basictests_cpp_ios.cfg | 2 +- tools/internal_ci/macos/grpc_basictests_csharp.cfg | 2 +- .../macos/grpc_basictests_objc_examples.cfg | 2 +- tools/internal_ci/macos/grpc_basictests_objc_ios.cfg | 2 +- tools/internal_ci/macos/grpc_basictests_objc_mac.cfg | 2 +- tools/internal_ci/macos/grpc_basictests_objc_tvos.cfg | 2 +- tools/internal_ci/macos/grpc_basictests_php.cfg | 2 +- tools/internal_ci/macos/grpc_basictests_python.cfg | 2 +- tools/internal_ci/macos/grpc_basictests_ruby.cfg | 2 +- tools/internal_ci/macos/grpc_interop_toprod.sh | 2 +- .../macos/pull_request/grpc_basictests_c_cpp_dbg.cfg | 2 +- .../macos/pull_request/grpc_basictests_cpp_ios.cfg | 2 +- .../macos/pull_request/grpc_basictests_csharp.cfg | 2 +- .../pull_request/grpc_basictests_objc_examples.cfg | 2 +- .../macos/pull_request/grpc_basictests_objc_ios.cfg | 2 +- .../macos/pull_request/grpc_basictests_objc_mac.cfg | 2 +- .../macos/pull_request/grpc_basictests_objc_tvos.cfg | 2 +- .../macos/pull_request/grpc_basictests_php.cfg | 2 +- .../macos/pull_request/grpc_basictests_python.cfg | 2 +- .../macos/pull_request/grpc_basictests_ruby.cfg | 2 +- tools/internal_ci/windows/grpc_basictests_c.cfg | 2 +- tools/internal_ci/windows/grpc_basictests_csharp.cfg | 2 +- tools/internal_ci/windows/grpc_basictests_python.cfg | 2 +- tools/internal_ci/windows/grpc_portability.cfg | 2 +- .../windows/grpc_portability_build_only.cfg | 2 +- .../windows/pull_request/grpc_basictests_c.cfg | 2 +- .../windows/pull_request/grpc_basictests_csharp.cfg | 2 +- .../windows/pull_request/grpc_basictests_python.cfg | 2 +- tools/run_tests/run_interop_tests.py | 10 ---------- tools/run_tests/run_tests_matrix.py | 10 ---------- 68 files changed, 66 insertions(+), 86 deletions(-) diff --git a/tools/internal_ci/linux/arm64/grpc_basictests_csharp.cfg b/tools/internal_ci/linux/arm64/grpc_basictests_csharp.cfg index dfd3e27c966..3b5e1cfb4b8 100644 --- a/tools/internal_ci/linux/arm64/grpc_basictests_csharp.cfg +++ b/tools/internal_ci/linux/arm64/grpc_basictests_csharp.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests_arm64 linux csharp --inner_jobs 4 -j 1 --internal_ci --bq_result_table aggregate_results" + value: "-f basictests_arm64 linux csharp --inner_jobs 4 -j 1 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/linux/arm64/grpc_basictests_php.cfg b/tools/internal_ci/linux/arm64/grpc_basictests_php.cfg index cda33bc6d64..d3183434a99 100644 --- a/tools/internal_ci/linux/arm64/grpc_basictests_php.cfg +++ b/tools/internal_ci/linux/arm64/grpc_basictests_php.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests_arm64 linux php7 --inner_jobs 16 -j 2 --internal_ci --bq_result_table aggregate_results" + value: "-f basictests_arm64 linux php7 --inner_jobs 16 -j 2 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/linux/arm64/grpc_basictests_python.cfg b/tools/internal_ci/linux/arm64/grpc_basictests_python.cfg index f3038d8fa1c..320628a0150 100644 --- a/tools/internal_ci/linux/arm64/grpc_basictests_python.cfg +++ b/tools/internal_ci/linux/arm64/grpc_basictests_python.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests_arm64 linux python --inner_jobs 16 -j 2 --internal_ci --bq_result_table aggregate_results" + value: "-f basictests_arm64 linux python --inner_jobs 16 -j 2 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/linux/arm64/grpc_basictests_ruby.cfg b/tools/internal_ci/linux/arm64/grpc_basictests_ruby.cfg index 4b6c9d28d8a..cb0be0fdde2 100644 --- a/tools/internal_ci/linux/arm64/grpc_basictests_ruby.cfg +++ b/tools/internal_ci/linux/arm64/grpc_basictests_ruby.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests_arm64 linux ruby --inner_jobs 16 -j 2 --internal_ci --bq_result_table aggregate_results" + value: "-f basictests_arm64 linux ruby --inner_jobs 16 -j 2 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/linux/grpc_basictests_c_cpp_dbg.cfg b/tools/internal_ci/linux/grpc_basictests_c_cpp_dbg.cfg index 07f7f0c6591..6e0ae6084ca 100644 --- a/tools/internal_ci/linux/grpc_basictests_c_cpp_dbg.cfg +++ b/tools/internal_ci/linux/grpc_basictests_c_cpp_dbg.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests linux corelang dbg --inner_jobs 16 -j 1 --internal_ci --bq_result_table aggregate_results" + value: "-f basictests linux corelang dbg --inner_jobs 16 -j 1 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/linux/grpc_basictests_c_cpp_opt.cfg b/tools/internal_ci/linux/grpc_basictests_c_cpp_opt.cfg index 8f2813febf8..93a8f4b342a 100644 --- a/tools/internal_ci/linux/grpc_basictests_c_cpp_opt.cfg +++ b/tools/internal_ci/linux/grpc_basictests_c_cpp_opt.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests linux corelang opt --inner_jobs 16 -j 1 --internal_ci --bq_result_table aggregate_results" + value: "-f basictests linux corelang opt --inner_jobs 16 -j 1 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/linux/grpc_basictests_csharp.cfg b/tools/internal_ci/linux/grpc_basictests_csharp.cfg index d6c237609c9..6ea90e09bb1 100644 --- a/tools/internal_ci/linux/grpc_basictests_csharp.cfg +++ b/tools/internal_ci/linux/grpc_basictests_csharp.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests linux csharp --inner_jobs 4 -j 1 --internal_ci --bq_result_table aggregate_results" + value: "-f basictests linux csharp --inner_jobs 4 -j 1 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/linux/grpc_basictests_php.cfg b/tools/internal_ci/linux/grpc_basictests_php.cfg index 012709cfe44..998d90ee4b0 100644 --- a/tools/internal_ci/linux/grpc_basictests_php.cfg +++ b/tools/internal_ci/linux/grpc_basictests_php.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests linux php7 --inner_jobs 16 -j 2 --internal_ci --bq_result_table aggregate_results" + value: "-f basictests linux php7 --inner_jobs 16 -j 2 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/linux/grpc_basictests_python.cfg b/tools/internal_ci/linux/grpc_basictests_python.cfg index 444dba9f4df..4bdccb7d0c3 100644 --- a/tools/internal_ci/linux/grpc_basictests_python.cfg +++ b/tools/internal_ci/linux/grpc_basictests_python.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests linux python --inner_jobs 16 -j 2 --internal_ci --bq_result_table aggregate_results" + value: "-f basictests linux python --inner_jobs 16 -j 2 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/linux/grpc_basictests_ruby.cfg b/tools/internal_ci/linux/grpc_basictests_ruby.cfg index 336aa469958..77360aca174 100644 --- a/tools/internal_ci/linux/grpc_basictests_ruby.cfg +++ b/tools/internal_ci/linux/grpc_basictests_ruby.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests linux ruby --inner_jobs 16 -j 2 --internal_ci --bq_result_table aggregate_results" + value: "-f basictests linux ruby --inner_jobs 16 -j 2 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/linux/grpc_build_submodule_at_head.sh b/tools/internal_ci/linux/grpc_build_submodule_at_head.sh index 67109ab24ad..92df3390ead 100755 --- a/tools/internal_ci/linux/grpc_build_submodule_at_head.sh +++ b/tools/internal_ci/linux/grpc_build_submodule_at_head.sh @@ -90,4 +90,4 @@ tools/buildgen/generate_projects.sh git add -A git -c user.name='foo' -c user.email='foo@google.com' commit -m 'Update submodule' --allow-empty -tools/run_tests/run_tests_matrix.py -f linux --exclude c sanity basictests_arm64 openssl dbg $EXTRA_EXCLUDE_FILTER --inner_jobs 16 -j 2 --internal_ci --build_only +tools/run_tests/run_tests_matrix.py -f linux --exclude c sanity basictests_arm64 openssl dbg $EXTRA_EXCLUDE_FILTER --inner_jobs 16 -j 2 --build_only diff --git a/tools/internal_ci/linux/grpc_clang_tidy.cfg b/tools/internal_ci/linux/grpc_clang_tidy.cfg index 675014173e9..0df876c0a13 100644 --- a/tools/internal_ci/linux/grpc_clang_tidy.cfg +++ b/tools/internal_ci/linux/grpc_clang_tidy.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests linux clang-tidy --inner_jobs 32 -j 1 --internal_ci --bq_result_table aggregate_results" + value: "-f basictests linux clang-tidy --inner_jobs 32 -j 1 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/linux/grpc_interop_alts.cfg b/tools/internal_ci/linux/grpc_interop_alts.cfg index 4684aba96bf..c5bf167aa68 100644 --- a/tools/internal_ci/linux/grpc_interop_alts.cfg +++ b/tools/internal_ci/linux/grpc_interop_alts.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-l all -s all --use_docker --transport_security alts --internal_ci -t -j 12 --bq_result_table interop_results" + value: "-l all -s all --use_docker --transport_security alts -t -j 12 --bq_result_table interop_results" } diff --git a/tools/internal_ci/linux/grpc_interop_tocloud.cfg b/tools/internal_ci/linux/grpc_interop_tocloud.cfg index 9b35adcece2..30c4b28cd4c 100644 --- a/tools/internal_ci/linux/grpc_interop_tocloud.cfg +++ b/tools/internal_ci/linux/grpc_interop_tocloud.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-l all -s all --use_docker --http2_interop --internal_ci -t -j 8 --bq_result_table interop_results" + value: "-l all -s all --use_docker --http2_interop -t -j 8 --bq_result_table interop_results" } diff --git a/tools/internal_ci/linux/grpc_interop_toprod.cfg b/tools/internal_ci/linux/grpc_interop_toprod.cfg index 377dff771fe..9464f6d1b6f 100644 --- a/tools/internal_ci/linux/grpc_interop_toprod.cfg +++ b/tools/internal_ci/linux/grpc_interop_toprod.cfg @@ -26,7 +26,7 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-l all --cloud_to_prod --cloud_to_prod_auth --prod_servers default gateway_v4 --use_docker --internal_ci -t -j 8 --bq_result_table interop_results" + value: "-l all --cloud_to_prod --cloud_to_prod_auth --prod_servers default gateway_v4 --use_docker -t -j 8 --bq_result_table interop_results" } before_action { diff --git a/tools/internal_ci/linux/grpc_portability.cfg b/tools/internal_ci/linux/grpc_portability.cfg index f417f24bb1c..dbfce09e206 100644 --- a/tools/internal_ci/linux/grpc_portability.cfg +++ b/tools/internal_ci/linux/grpc_portability.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f portability linux --inner_jobs 16 -j 1 --internal_ci --bq_result_table aggregate_results" + value: "-f portability linux --inner_jobs 16 -j 1 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/linux/grpc_pull_request_sanity.cfg b/tools/internal_ci/linux/grpc_pull_request_sanity.cfg index 704d5c6cbc9..4f763be4336 100644 --- a/tools/internal_ci/linux/grpc_pull_request_sanity.cfg +++ b/tools/internal_ci/linux/grpc_pull_request_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 opt --inner_jobs 16 -j 1" } diff --git a/tools/internal_ci/linux/grpc_sanity.cfg b/tools/internal_ci/linux/grpc_sanity.cfg index 84ef26fa2d0..8d9d5963582 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 --inner_jobs 16 -j 1 --internal_ci --bq_result_table aggregate_results" + value: "-f basictests linux sanity --inner_jobs 16 -j 1 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/linux/pull_request/grpc_basictests_csharp.cfg b/tools/internal_ci/linux/pull_request/grpc_basictests_csharp.cfg index 31873ea3409..fc63d6571a5 100644 --- a/tools/internal_ci/linux/pull_request/grpc_basictests_csharp.cfg +++ b/tools/internal_ci/linux/pull_request/grpc_basictests_csharp.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests linux csharp --inner_jobs 4 -j 1 --internal_ci --max_time=3600" + value: "-f basictests linux csharp --inner_jobs 4 -j 1 --max_time=3600" } diff --git a/tools/internal_ci/linux/pull_request/grpc_basictests_php.cfg b/tools/internal_ci/linux/pull_request/grpc_basictests_php.cfg index a83ce016467..e735b6f4ce6 100644 --- a/tools/internal_ci/linux/pull_request/grpc_basictests_php.cfg +++ b/tools/internal_ci/linux/pull_request/grpc_basictests_php.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests linux php7 --inner_jobs 16 -j 2 --internal_ci --max_time=3600" + value: "-f basictests linux php7 --inner_jobs 16 -j 2 --max_time=3600" } diff --git a/tools/internal_ci/linux/pull_request/grpc_basictests_python.cfg b/tools/internal_ci/linux/pull_request/grpc_basictests_python.cfg index b4e91c2a7e2..b8ac0a53600 100644 --- a/tools/internal_ci/linux/pull_request/grpc_basictests_python.cfg +++ b/tools/internal_ci/linux/pull_request/grpc_basictests_python.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests linux python --inner_jobs 16 -j 2 --internal_ci --max_time=3600" + value: "-f basictests linux python --inner_jobs 16 -j 2 --max_time=3600" } diff --git a/tools/internal_ci/linux/pull_request/grpc_basictests_ruby.cfg b/tools/internal_ci/linux/pull_request/grpc_basictests_ruby.cfg index 49d3dad592e..1c689ad62e4 100644 --- a/tools/internal_ci/linux/pull_request/grpc_basictests_ruby.cfg +++ b/tools/internal_ci/linux/pull_request/grpc_basictests_ruby.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests linux ruby --inner_jobs 16 -j 2 --internal_ci --max_time=3600" + value: "-f basictests linux ruby --inner_jobs 16 -j 2 --max_time=3600" } diff --git a/tools/internal_ci/linux/pull_request/grpc_clang_tidy.cfg b/tools/internal_ci/linux/pull_request/grpc_clang_tidy.cfg index 7a42c3a48a0..0e2e82a3961 100644 --- a/tools/internal_ci/linux/pull_request/grpc_clang_tidy.cfg +++ b/tools/internal_ci/linux/pull_request/grpc_clang_tidy.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests linux clang-tidy --inner_jobs 32 -j 1 --internal_ci" + value: "-f basictests linux clang-tidy --inner_jobs 32 -j 1" } diff --git a/tools/internal_ci/linux/pull_request/grpc_sanity.cfg b/tools/internal_ci/linux/pull_request/grpc_sanity.cfg index 866fdfd2a3e..793120d49e1 100644 --- a/tools/internal_ci/linux/pull_request/grpc_sanity.cfg +++ b/tools/internal_ci/linux/pull_request/grpc_sanity.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests linux sanity --inner_jobs 16 -j 1 --internal_ci" + value: "-f basictests linux sanity --inner_jobs 16 -j 1" } diff --git a/tools/internal_ci/linux/sanitizer/grpc_c_asan.cfg b/tools/internal_ci/linux/sanitizer/grpc_c_asan.cfg index d6d70677ddf..3b68a9ffd4f 100644 --- a/tools/internal_ci/linux/sanitizer/grpc_c_asan.cfg +++ b/tools/internal_ci/linux/sanitizer/grpc_c_asan.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f c asan --inner_jobs 16 -j 1 --internal_ci --bq_result_table aggregate_results" + value: "-f c asan --inner_jobs 16 -j 1 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/linux/sanitizer/grpc_c_msan.cfg b/tools/internal_ci/linux/sanitizer/grpc_c_msan.cfg index 7b22c6afef5..a0c7323e07e 100644 --- a/tools/internal_ci/linux/sanitizer/grpc_c_msan.cfg +++ b/tools/internal_ci/linux/sanitizer/grpc_c_msan.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f c msan --inner_jobs 16 -j 1 --internal_ci --bq_result_table aggregate_results" + value: "-f c msan --inner_jobs 16 -j 1 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/linux/sanitizer/grpc_c_tsan.cfg b/tools/internal_ci/linux/sanitizer/grpc_c_tsan.cfg index 6c9dd6ef8dc..cfcc33c5af9 100644 --- a/tools/internal_ci/linux/sanitizer/grpc_c_tsan.cfg +++ b/tools/internal_ci/linux/sanitizer/grpc_c_tsan.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f c tsan --inner_jobs 16 -j 1 --internal_ci --bq_result_table aggregate_results" + value: "-f c tsan --inner_jobs 16 -j 1 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/linux/sanitizer/grpc_c_ubsan.cfg b/tools/internal_ci/linux/sanitizer/grpc_c_ubsan.cfg index 8700c74c8d9..cc8f3493602 100644 --- a/tools/internal_ci/linux/sanitizer/grpc_c_ubsan.cfg +++ b/tools/internal_ci/linux/sanitizer/grpc_c_ubsan.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f c ubsan --inner_jobs 16 -j 1 --internal_ci --bq_result_table aggregate_results" + value: "-f c ubsan --inner_jobs 16 -j 1 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/linux/sanitizer/grpc_cpp_asan.cfg b/tools/internal_ci/linux/sanitizer/grpc_cpp_asan.cfg index 02162d860b0..214dbe854e9 100644 --- a/tools/internal_ci/linux/sanitizer/grpc_cpp_asan.cfg +++ b/tools/internal_ci/linux/sanitizer/grpc_cpp_asan.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f c++ asan --inner_jobs 16 -j 1 --internal_ci --bq_result_table aggregate_results" + value: "-f c++ asan --inner_jobs 16 -j 1 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/linux/sanitizer/grpc_cpp_tsan.cfg b/tools/internal_ci/linux/sanitizer/grpc_cpp_tsan.cfg index 95582184ed1..622994036dd 100644 --- a/tools/internal_ci/linux/sanitizer/grpc_cpp_tsan.cfg +++ b/tools/internal_ci/linux/sanitizer/grpc_cpp_tsan.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f c++ tsan --inner_jobs 16 -j 1 --internal_ci --bq_result_table aggregate_results" + value: "-f c++ tsan --inner_jobs 16 -j 1 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/linux/sanitizer/pull_request/grpc_c_asan.cfg b/tools/internal_ci/linux/sanitizer/pull_request/grpc_c_asan.cfg index d444596a81e..5bd548e897c 100644 --- a/tools/internal_ci/linux/sanitizer/pull_request/grpc_c_asan.cfg +++ b/tools/internal_ci/linux/sanitizer/pull_request/grpc_c_asan.cfg @@ -27,5 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f c asan --inner_jobs 16 -j 1 --internal_ci --max_time=3600" + value: "-f c asan --inner_jobs 16 -j 1 --max_time=3600" } diff --git a/tools/internal_ci/linux/sanitizer/pull_request/grpc_c_msan.cfg b/tools/internal_ci/linux/sanitizer/pull_request/grpc_c_msan.cfg index 3891cc37e8e..431b531b805 100644 --- a/tools/internal_ci/linux/sanitizer/pull_request/grpc_c_msan.cfg +++ b/tools/internal_ci/linux/sanitizer/pull_request/grpc_c_msan.cfg @@ -27,5 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f c msan --inner_jobs 16 -j 1 --internal_ci --max_time=3600" + value: "-f c msan --inner_jobs 16 -j 1 --max_time=3600" } diff --git a/tools/internal_ci/linux/sanitizer/pull_request/grpc_c_tsan.cfg b/tools/internal_ci/linux/sanitizer/pull_request/grpc_c_tsan.cfg index 91ce1627afc..4657524755e 100644 --- a/tools/internal_ci/linux/sanitizer/pull_request/grpc_c_tsan.cfg +++ b/tools/internal_ci/linux/sanitizer/pull_request/grpc_c_tsan.cfg @@ -27,5 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f c tsan --inner_jobs 16 -j 1 --internal_ci --max_time=3600" + value: "-f c tsan --inner_jobs 16 -j 1 --max_time=3600" } diff --git a/tools/internal_ci/linux/sanitizer/pull_request/grpc_c_ubsan.cfg b/tools/internal_ci/linux/sanitizer/pull_request/grpc_c_ubsan.cfg index fcdc2de37bb..12392b2b1bc 100644 --- a/tools/internal_ci/linux/sanitizer/pull_request/grpc_c_ubsan.cfg +++ b/tools/internal_ci/linux/sanitizer/pull_request/grpc_c_ubsan.cfg @@ -27,5 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f c ubsan --inner_jobs 16 -j 1 --internal_ci --max_time=3600" + value: "-f c ubsan --inner_jobs 16 -j 1 --max_time=3600" } diff --git a/tools/internal_ci/linux/sanitizer/pull_request/grpc_cpp_asan.cfg b/tools/internal_ci/linux/sanitizer/pull_request/grpc_cpp_asan.cfg index de2a74051b6..bf4ba1d43db 100644 --- a/tools/internal_ci/linux/sanitizer/pull_request/grpc_cpp_asan.cfg +++ b/tools/internal_ci/linux/sanitizer/pull_request/grpc_cpp_asan.cfg @@ -27,5 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f c++ asan --inner_jobs 16 -j 1 --internal_ci --max_time=3600" + value: "-f c++ asan --inner_jobs 16 -j 1 --max_time=3600" } diff --git a/tools/internal_ci/linux/sanitizer/pull_request/grpc_cpp_tsan.cfg b/tools/internal_ci/linux/sanitizer/pull_request/grpc_cpp_tsan.cfg index 51c291f7dff..eb9b8734d05 100644 --- a/tools/internal_ci/linux/sanitizer/pull_request/grpc_cpp_tsan.cfg +++ b/tools/internal_ci/linux/sanitizer/pull_request/grpc_cpp_tsan.cfg @@ -27,5 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f c++ tsan --inner_jobs 16 -j 1 --internal_ci --max_time=3600" + value: "-f c++ tsan --inner_jobs 16 -j 1 --max_time=3600" } diff --git a/tools/internal_ci/macos/grpc_basictests_c_cpp_dbg.cfg b/tools/internal_ci/macos/grpc_basictests_c_cpp_dbg.cfg index afff9a50ee6..bcd690cae1a 100644 --- a/tools/internal_ci/macos/grpc_basictests_c_cpp_dbg.cfg +++ b/tools/internal_ci/macos/grpc_basictests_c_cpp_dbg.cfg @@ -27,5 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests macos corelang dbg --internal_ci -j 4 --inner_jobs 8 --bq_result_table aggregate_results" + value: "-f basictests macos corelang dbg -j 4 --inner_jobs 8 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/macos/grpc_basictests_c_cpp_opt.cfg b/tools/internal_ci/macos/grpc_basictests_c_cpp_opt.cfg index 0c8aae6026c..00bf6ba81f8 100644 --- a/tools/internal_ci/macos/grpc_basictests_c_cpp_opt.cfg +++ b/tools/internal_ci/macos/grpc_basictests_c_cpp_opt.cfg @@ -27,5 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests macos corelang opt --internal_ci -j 4 --inner_jobs 8 --bq_result_table aggregate_results" + value: "-f basictests macos corelang opt -j 4 --inner_jobs 8 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/macos/grpc_basictests_cpp_ios.cfg b/tools/internal_ci/macos/grpc_basictests_cpp_ios.cfg index d3b81517da4..d26949bb786 100644 --- a/tools/internal_ci/macos/grpc_basictests_cpp_ios.cfg +++ b/tools/internal_ci/macos/grpc_basictests_cpp_ios.cfg @@ -27,5 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests macos objc opt --internal_ci -j 1 --inner_jobs 4 --bq_result_table aggregate_results --extra_args -r ios-cpp-test-.*" + value: "-f basictests macos objc opt -j 1 --inner_jobs 4 --bq_result_table aggregate_results --extra_args -r ios-cpp-test-.*" } diff --git a/tools/internal_ci/macos/grpc_basictests_csharp.cfg b/tools/internal_ci/macos/grpc_basictests_csharp.cfg index 6c48a5bcf1f..02e22714ef1 100644 --- a/tools/internal_ci/macos/grpc_basictests_csharp.cfg +++ b/tools/internal_ci/macos/grpc_basictests_csharp.cfg @@ -27,5 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests macos csharp --internal_ci -j 1 --inner_jobs 4 --bq_result_table aggregate_results" + value: "-f basictests macos csharp -j 1 --inner_jobs 4 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/macos/grpc_basictests_objc_examples.cfg b/tools/internal_ci/macos/grpc_basictests_objc_examples.cfg index 309c4429d17..50c93fd6b96 100644 --- a/tools/internal_ci/macos/grpc_basictests_objc_examples.cfg +++ b/tools/internal_ci/macos/grpc_basictests_objc_examples.cfg @@ -27,5 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests macos objc opt --internal_ci -j 1 --inner_jobs 4 --bq_result_table aggregate_results --extra_args -r ios-buildtest-.*" + value: "-f basictests macos objc opt -j 1 --inner_jobs 4 --bq_result_table aggregate_results --extra_args -r ios-buildtest-.*" } diff --git a/tools/internal_ci/macos/grpc_basictests_objc_ios.cfg b/tools/internal_ci/macos/grpc_basictests_objc_ios.cfg index dc9adbdc566..2c19e2370ea 100644 --- a/tools/internal_ci/macos/grpc_basictests_objc_ios.cfg +++ b/tools/internal_ci/macos/grpc_basictests_objc_ios.cfg @@ -27,5 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests macos objc opt --internal_ci -j 1 --inner_jobs 4 --bq_result_table aggregate_results --extra_args -r ios-test-.*" + value: "-f basictests macos objc opt -j 1 --inner_jobs 4 --bq_result_table aggregate_results --extra_args -r ios-test-.*" } diff --git a/tools/internal_ci/macos/grpc_basictests_objc_mac.cfg b/tools/internal_ci/macos/grpc_basictests_objc_mac.cfg index 1087217217f..fe339bfd109 100644 --- a/tools/internal_ci/macos/grpc_basictests_objc_mac.cfg +++ b/tools/internal_ci/macos/grpc_basictests_objc_mac.cfg @@ -27,5 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests macos objc opt --internal_ci -j 1 --inner_jobs 4 --bq_result_table aggregate_results --extra_args -r mac-test-.*" + value: "-f basictests macos objc opt -j 1 --inner_jobs 4 --bq_result_table aggregate_results --extra_args -r mac-test-.*" } diff --git a/tools/internal_ci/macos/grpc_basictests_objc_tvos.cfg b/tools/internal_ci/macos/grpc_basictests_objc_tvos.cfg index 17940f48c36..bd3a365fa32 100644 --- a/tools/internal_ci/macos/grpc_basictests_objc_tvos.cfg +++ b/tools/internal_ci/macos/grpc_basictests_objc_tvos.cfg @@ -27,6 +27,6 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests macos objc opt --internal_ci -j 1 --inner_jobs 4 --bq_result_table aggregate_results --extra_args -r tvos-test-.*" + value: "-f basictests macos objc opt -j 1 --inner_jobs 4 --bq_result_table aggregate_results --extra_args -r tvos-test-.*" } diff --git a/tools/internal_ci/macos/grpc_basictests_php.cfg b/tools/internal_ci/macos/grpc_basictests_php.cfg index b96bd03f976..f54293cba8b 100644 --- a/tools/internal_ci/macos/grpc_basictests_php.cfg +++ b/tools/internal_ci/macos/grpc_basictests_php.cfg @@ -27,5 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests macos php7 --internal_ci -j 1 --inner_jobs 4 --bq_result_table aggregate_results" + value: "-f basictests macos php7 -j 1 --inner_jobs 4 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/macos/grpc_basictests_python.cfg b/tools/internal_ci/macos/grpc_basictests_python.cfg index 575ddaf82cb..6a8ab4048ed 100644 --- a/tools/internal_ci/macos/grpc_basictests_python.cfg +++ b/tools/internal_ci/macos/grpc_basictests_python.cfg @@ -27,5 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests macos python --internal_ci -j 1 --inner_jobs 4 --bq_result_table aggregate_results" + value: "-f basictests macos python -j 1 --inner_jobs 4 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/macos/grpc_basictests_ruby.cfg b/tools/internal_ci/macos/grpc_basictests_ruby.cfg index 51b4d87e0a4..7566df42cde 100644 --- a/tools/internal_ci/macos/grpc_basictests_ruby.cfg +++ b/tools/internal_ci/macos/grpc_basictests_ruby.cfg @@ -27,5 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests macos ruby --internal_ci -j 1 --inner_jobs 4 --bq_result_table aggregate_results" + value: "-f basictests macos ruby -j 1 --inner_jobs 4 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/macos/grpc_interop_toprod.sh b/tools/internal_ci/macos/grpc_interop_toprod.sh index 962a37d8eb5..174e25380f4 100755 --- a/tools/internal_ci/macos/grpc_interop_toprod.sh +++ b/tools/internal_ci/macos/grpc_interop_toprod.sh @@ -42,7 +42,7 @@ tools/run_tests/run_interop_tests.py -l c++ \ --prod_servers default gateway_v4 \ --service_account_key_file="${KOKORO_KEYSTORE_DIR}/73836_interop_to_prod_tests_service_account_key" \ --default_service_account="interop-to-prod-tests@grpc-testing.iam.gserviceaccount.com" \ - --skip_compute_engine_creds --internal_ci -t -j 4 || FAILED="true" + --skip_compute_engine_creds -t -j 4 || FAILED="true" if [ "$FAILED" != "" ] then diff --git a/tools/internal_ci/macos/pull_request/grpc_basictests_c_cpp_dbg.cfg b/tools/internal_ci/macos/pull_request/grpc_basictests_c_cpp_dbg.cfg index 7e140b1ee7c..bd0ed6ef338 100644 --- a/tools/internal_ci/macos/pull_request/grpc_basictests_c_cpp_dbg.cfg +++ b/tools/internal_ci/macos/pull_request/grpc_basictests_c_cpp_dbg.cfg @@ -28,5 +28,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" # on pull requests, only run the "dbg" configuration due to CI resource constraints - value: "-f basictests macos corelang dbg --internal_ci -j 4 --inner_jobs 8 --max_time=3600" + value: "-f basictests macos corelang dbg -j 4 --inner_jobs 8 --max_time=3600" } diff --git a/tools/internal_ci/macos/pull_request/grpc_basictests_cpp_ios.cfg b/tools/internal_ci/macos/pull_request/grpc_basictests_cpp_ios.cfg index a34b9aa9ff2..7ec76be2096 100644 --- a/tools/internal_ci/macos/pull_request/grpc_basictests_cpp_ios.cfg +++ b/tools/internal_ci/macos/pull_request/grpc_basictests_cpp_ios.cfg @@ -27,5 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests macos objc opt --internal_ci -j 1 --inner_jobs 4 --extra_args -r ios-cpp-test-.*" + value: "-f basictests macos objc opt -j 1 --inner_jobs 4 --extra_args -r ios-cpp-test-.*" } diff --git a/tools/internal_ci/macos/pull_request/grpc_basictests_csharp.cfg b/tools/internal_ci/macos/pull_request/grpc_basictests_csharp.cfg index 5ee22e375d0..d8f7a3150f6 100644 --- a/tools/internal_ci/macos/pull_request/grpc_basictests_csharp.cfg +++ b/tools/internal_ci/macos/pull_request/grpc_basictests_csharp.cfg @@ -27,5 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests macos csharp --internal_ci -j 1 --inner_jobs 4 --max_time=3600" + value: "-f basictests macos csharp -j 1 --inner_jobs 4 --max_time=3600" } diff --git a/tools/internal_ci/macos/pull_request/grpc_basictests_objc_examples.cfg b/tools/internal_ci/macos/pull_request/grpc_basictests_objc_examples.cfg index 79b4fef0c0e..7a36a80cf90 100644 --- a/tools/internal_ci/macos/pull_request/grpc_basictests_objc_examples.cfg +++ b/tools/internal_ci/macos/pull_request/grpc_basictests_objc_examples.cfg @@ -27,5 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests macos objc opt --internal_ci -j 1 --inner_jobs 4 --extra_args -r ios-buildtest-.*" + value: "-f basictests macos objc opt -j 1 --inner_jobs 4 --extra_args -r ios-buildtest-.*" } diff --git a/tools/internal_ci/macos/pull_request/grpc_basictests_objc_ios.cfg b/tools/internal_ci/macos/pull_request/grpc_basictests_objc_ios.cfg index 530dc1d41b9..cd03f3dd433 100644 --- a/tools/internal_ci/macos/pull_request/grpc_basictests_objc_ios.cfg +++ b/tools/internal_ci/macos/pull_request/grpc_basictests_objc_ios.cfg @@ -27,5 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests macos objc opt --internal_ci -j 1 --inner_jobs 4 --extra_args -r ios-test-.*" + value: "-f basictests macos objc opt -j 1 --inner_jobs 4 --extra_args -r ios-test-.*" } diff --git a/tools/internal_ci/macos/pull_request/grpc_basictests_objc_mac.cfg b/tools/internal_ci/macos/pull_request/grpc_basictests_objc_mac.cfg index 66f98d4d0d3..8dc50b4d0d6 100644 --- a/tools/internal_ci/macos/pull_request/grpc_basictests_objc_mac.cfg +++ b/tools/internal_ci/macos/pull_request/grpc_basictests_objc_mac.cfg @@ -27,5 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests macos objc opt --internal_ci -j 1 --inner_jobs 4 --extra_args -r mac-test-.*" + value: "-f basictests macos objc opt -j 1 --inner_jobs 4 --extra_args -r mac-test-.*" } diff --git a/tools/internal_ci/macos/pull_request/grpc_basictests_objc_tvos.cfg b/tools/internal_ci/macos/pull_request/grpc_basictests_objc_tvos.cfg index 64d67ee53a9..065331a699e 100644 --- a/tools/internal_ci/macos/pull_request/grpc_basictests_objc_tvos.cfg +++ b/tools/internal_ci/macos/pull_request/grpc_basictests_objc_tvos.cfg @@ -27,5 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests macos objc opt --internal_ci -j 1 --inner_jobs 4 --extra_args -r tvos-test-.*" + value: "-f basictests macos objc opt -j 1 --inner_jobs 4 --extra_args -r tvos-test-.*" } diff --git a/tools/internal_ci/macos/pull_request/grpc_basictests_php.cfg b/tools/internal_ci/macos/pull_request/grpc_basictests_php.cfg index 880d8aa733b..b8ee5a6579b 100644 --- a/tools/internal_ci/macos/pull_request/grpc_basictests_php.cfg +++ b/tools/internal_ci/macos/pull_request/grpc_basictests_php.cfg @@ -27,5 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests macos php7 --internal_ci -j 1 --inner_jobs 4 --max_time=3600" + value: "-f basictests macos php7 -j 1 --inner_jobs 4 --max_time=3600" } diff --git a/tools/internal_ci/macos/pull_request/grpc_basictests_python.cfg b/tools/internal_ci/macos/pull_request/grpc_basictests_python.cfg index 71f71604ae1..42a771e32f0 100644 --- a/tools/internal_ci/macos/pull_request/grpc_basictests_python.cfg +++ b/tools/internal_ci/macos/pull_request/grpc_basictests_python.cfg @@ -27,5 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests macos python --internal_ci -j 1 --inner_jobs 4 --max_time=3600" + value: "-f basictests macos python -j 1 --inner_jobs 4 --max_time=3600" } diff --git a/tools/internal_ci/macos/pull_request/grpc_basictests_ruby.cfg b/tools/internal_ci/macos/pull_request/grpc_basictests_ruby.cfg index 1b60ddef9b0..187e8fb83aa 100644 --- a/tools/internal_ci/macos/pull_request/grpc_basictests_ruby.cfg +++ b/tools/internal_ci/macos/pull_request/grpc_basictests_ruby.cfg @@ -27,5 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests macos ruby --internal_ci -j 1 --inner_jobs 4 --max_time=3600" + value: "-f basictests macos ruby obs 4 --max_time=3600" } diff --git a/tools/internal_ci/windows/grpc_basictests_c.cfg b/tools/internal_ci/windows/grpc_basictests_c.cfg index 223cf389d0e..b0fcd1e0fe2 100644 --- a/tools/internal_ci/windows/grpc_basictests_c.cfg +++ b/tools/internal_ci/windows/grpc_basictests_c.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests windows c -j 1 --inner_jobs 8 --internal_ci --bq_result_table aggregate_results" + value: "-f basictests windows c -j 1 --inner_jobs 8 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/windows/grpc_basictests_csharp.cfg b/tools/internal_ci/windows/grpc_basictests_csharp.cfg index 17f2d87610f..7fb2f065ca6 100644 --- a/tools/internal_ci/windows/grpc_basictests_csharp.cfg +++ b/tools/internal_ci/windows/grpc_basictests_csharp.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests windows csharp -j 1 --inner_jobs 1 --internal_ci --bq_result_table aggregate_results" + value: "-f basictests windows csharp -j 1 --inner_jobs 1 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/windows/grpc_basictests_python.cfg b/tools/internal_ci/windows/grpc_basictests_python.cfg index 2d757789e13..09137a9df55 100644 --- a/tools/internal_ci/windows/grpc_basictests_python.cfg +++ b/tools/internal_ci/windows/grpc_basictests_python.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests windows python -j 1 --inner_jobs 8 --internal_ci --bq_result_table aggregate_results" + value: "-f basictests windows python -j 1 --inner_jobs 8 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/windows/grpc_portability.cfg b/tools/internal_ci/windows/grpc_portability.cfg index c17dadc2fc6..04bddc637b6 100644 --- a/tools/internal_ci/windows/grpc_portability.cfg +++ b/tools/internal_ci/windows/grpc_portability.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f portability windows -j 4 --inner_jobs 8 --internal_ci --bq_result_table aggregate_results" + value: "-f portability windows -j 4 --inner_jobs 8 --bq_result_table aggregate_results" } diff --git a/tools/internal_ci/windows/grpc_portability_build_only.cfg b/tools/internal_ci/windows/grpc_portability_build_only.cfg index 4df367f686b..6f917c76ce6 100644 --- a/tools/internal_ci/windows/grpc_portability_build_only.cfg +++ b/tools/internal_ci/windows/grpc_portability_build_only.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f portability windows c++ -j 4 --inner_jobs 8 --internal_ci --build_only" + value: "-f portability windows c++ -j 4 --inner_jobs 8 --build_only" } diff --git a/tools/internal_ci/windows/pull_request/grpc_basictests_c.cfg b/tools/internal_ci/windows/pull_request/grpc_basictests_c.cfg index 4cedcae9a87..cd384a68248 100644 --- a/tools/internal_ci/windows/pull_request/grpc_basictests_c.cfg +++ b/tools/internal_ci/windows/pull_request/grpc_basictests_c.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests windows c -j 1 --inner_jobs 8 --internal_ci --max_time=3600" + value: "-f basictests windows c -j 1 --inner_jobs 8 --max_time=3600" } diff --git a/tools/internal_ci/windows/pull_request/grpc_basictests_csharp.cfg b/tools/internal_ci/windows/pull_request/grpc_basictests_csharp.cfg index e5815b3cd71..1e6cf7bc76a 100644 --- a/tools/internal_ci/windows/pull_request/grpc_basictests_csharp.cfg +++ b/tools/internal_ci/windows/pull_request/grpc_basictests_csharp.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests windows csharp -j 1 --inner_jobs 8 --internal_ci --max_time=3600" + value: "-f basictests windows csharp -j 1 --inner_jobs 8 --max_time=3600" } diff --git a/tools/internal_ci/windows/pull_request/grpc_basictests_python.cfg b/tools/internal_ci/windows/pull_request/grpc_basictests_python.cfg index aba512d17d9..ab541436b40 100644 --- a/tools/internal_ci/windows/pull_request/grpc_basictests_python.cfg +++ b/tools/internal_ci/windows/pull_request/grpc_basictests_python.cfg @@ -26,5 +26,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests windows python -j 1 --inner_jobs 8 --internal_ci --max_time=5400" + value: "-f basictests windows python -j 1 --inner_jobs 8 --max_time=5400" } diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py index 059522b42d6..010f20fd380 100755 --- a/tools/run_tests/run_interop_tests.py +++ b/tools/run_tests/run_interop_tests.py @@ -1424,16 +1424,6 @@ argp.add_argument( const=True, help="Skip auth tests requiring access to compute engine credentials.", ) -argp.add_argument( - "--internal_ci", - default=False, - action="store_const", - const=True, - help=( - "(Deprecated, has no effect) Put reports into subdirectories to improve" - " presentation of results by Internal CI." - ), -) argp.add_argument( "--bq_result_table", default="", diff --git a/tools/run_tests/run_tests_matrix.py b/tools/run_tests/run_tests_matrix.py index 577642440ac..a1ac350319c 100755 --- a/tools/run_tests/run_tests_matrix.py +++ b/tools/run_tests/run_tests_matrix.py @@ -531,16 +531,6 @@ if __name__ == "__main__": help="Maximum amount of time to run tests for" + "(other tests will be skipped)", ) - argp.add_argument( - "--internal_ci", - default=False, - action="store_const", - const=True, - help=( - "(Deprecated, has no effect) Put reports into subdirectories to" - " improve presentation of results by Kokoro." - ), - ) argp.add_argument( "--bq_result_table", default="",