From f52b74d5bfc6ca9013965efc99673ef8d57c3115 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 7 Oct 2019 06:01:27 -0400 Subject: [PATCH] backport #20505 to v1.24.x --- .../linux/grpc_full_performance_master.sh | 13 ++----------- .../linux/grpc_full_performance_release.sh | 13 ++----------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/tools/internal_ci/linux/grpc_full_performance_master.sh b/tools/internal_ci/linux/grpc_full_performance_master.sh index 05a014b88ad..58240ccf4b5 100755 --- a/tools/internal_ci/linux/grpc_full_performance_master.sh +++ b/tools/internal_ci/linux/grpc_full_performance_master.sh @@ -31,7 +31,7 @@ tools/run_tests/run_performance_tests.py \ || EXIT_CODE=1 # prevent pushing leftover build files to remote hosts in the next step. -git clean -fdxq -e reports +git clean -fdxq -e reports -e run_performance_tests # scalability with 32cores (and upload to a different BQ table) tools/run_tests/run_performance_tests.py \ @@ -45,15 +45,6 @@ tools/run_tests/run_performance_tests.py \ || EXIT_CODE=1 # prevent pushing leftover build files to remote hosts in the next step. -git clean -fdxq -e reports - -# selected scenarios on Windows -tools/run_tests/run_performance_tests.py \ - -l csharp \ - --category scalable \ - --remote_worker_host grpc-kokoro-performance-windows1 grpc-kokoro-performance-windows2 \ - --bq_result_table performance_test.performance_experiment_windows \ - --xml_report reports/windows/sponge_log.xml \ - || EXIT_CODE=1 +git clean -fdxq -e reports -e run_performance_tests exit $EXIT_CODE diff --git a/tools/internal_ci/linux/grpc_full_performance_release.sh b/tools/internal_ci/linux/grpc_full_performance_release.sh index a31cea281fe..25d27c95197 100755 --- a/tools/internal_ci/linux/grpc_full_performance_release.sh +++ b/tools/internal_ci/linux/grpc_full_performance_release.sh @@ -31,7 +31,7 @@ tools/run_tests/run_performance_tests.py \ || EXIT_CODE=1 # prevent pushing leftover build files to remote hosts in the next step. -git clean -fdxq -e reports +git clean -fdxq -e reports -e run_performance_tests # scalability with 32cores (and upload to a different BQ table) tools/run_tests/run_performance_tests.py \ @@ -45,15 +45,6 @@ tools/run_tests/run_performance_tests.py \ || EXIT_CODE=1 # prevent pushing leftover build files to remote hosts in the next step. -git clean -fdxq -e reports - -# selected scenarios on Windows -tools/run_tests/run_performance_tests.py \ - -l csharp \ - --category scalable \ - --remote_worker_host grpc-kokoro-performance-windows1 grpc-kokoro-performance-windows2 \ - --bq_result_table performance_released.performance_experiment_windows \ - --xml_report reports/windows/sponge_log.xml \ - || EXIT_CODE=1 +git clean -fdxq -e reports -e run_performance_tests exit $EXIT_CODE