diff --git a/tools/integration_tests/run_e2e_tests.sh b/tools/integration_tests/run_e2e_tests.sh index ed9e210540..8aa2529ab7 100755 --- a/tools/integration_tests/run_e2e_tests.sh +++ b/tools/integration_tests/run_e2e_tests.sh @@ -287,10 +287,17 @@ function run_e2e_tests_for_hns_bucket(){ wait $non_parallel_tests_hns_group_pid non_parallel_tests_hns_group_exit_code=$? + # The concurrent_operations package, which experiences intermittent failures on presubmit tests, primarily due to parallel execution on the FLAT bucket, has been executed. + # Added it serially after all the tests are completed to avoid failures. + local log_file="/tmp/concurrent_operation_${hns_bucket_name_parallel_group}.log" + echo $log_file >> $TEST_LOGS_FILE + GODEBUG=asyncpreemptoff=1 go test ./tools/integration_tests/concurrent_operations $GO_TEST_SHORT_FLAG $PRESUBMIT_RUN_FLAG -p 1 --integrationTest -v --testbucket=$hns_bucket_name_non_parallel_group --testInstalledPackage=$RUN_E2E_TESTS_ON_PACKAGE -timeout $INTEGRATION_TEST_TIMEOUT > "$log_file" 2>&1 + non_parallel_tests_hns_group_exit_code_2=$? + hns_buckets=("$hns_bucket_name_parallel_group" "$hns_bucket_name_non_parallel_group") clean_up hns_buckets - if [ $parallel_tests_hns_group_exit_code != 0 ] || [ $non_parallel_tests_hns_group_exit_code!= 0 ]; + if [ $parallel_tests_hns_group_exit_code != 0 ] || [ $non_parallel_tests_hns_group_exit_code != 0 ] || [ $non_parallel_tests_hns_group_exit_code_2 != 0 ]; then return 1 fi