diff --git a/evergreen/fetch_remote_test_results.sh b/evergreen/fetch_remote_test_results.sh index 2ac57c15f78..0df94fb78a2 100644 --- a/evergreen/fetch_remote_test_results.sh +++ b/evergreen/fetch_remote_test_results.sh @@ -14,6 +14,11 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" . "$DIR/bazel_test_results_shutils.sh" +if [[ "${resmoke_disable_rbe_mirror}" == "true" && "${build_variant}" == "enterprise-amazon-linux2023-arm64-all-feature-flags-rbe" ]]; then + echo "Skipping: resmoke_disable_rbe_mirror=true on RBE mirror variant. We have force-disabled testing on this variant while resolving remote execution issues. Report to #ask-devprod-test-infrastructure if you have any issues." + exit 0 +fi + # Enumerates test results for each execution of ${test_label}. Shards/retries are individual executions with their own results. function enumerate_test_results() { jq --raw-output --compact-output --arg test_label "${test_label}" 'select(.testResult.testActionOutput != null) | diff --git a/evergreen/gather_local_test_results.sh b/evergreen/gather_local_test_results.sh index a6d88ee8748..c59f91a8e26 100644 --- a/evergreen/gather_local_test_results.sh +++ b/evergreen/gather_local_test_results.sh @@ -11,6 +11,11 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" . "$DIR/bazel_test_results_shutils.sh" +if [[ "${resmoke_disable_rbe_mirror}" == "true" && "${build_variant}" == "enterprise-amazon-linux2023-arm64-all-feature-flags-rbe" ]]; then + echo "Skipping: resmoke_disable_rbe_mirror=true on RBE mirror variant. We have force-disabled testing on this variant while resolving remote execution issues. Report to #ask-devprod-test-infrastructure if you have any issues." + exit 0 +fi + readonly target_prefix=$(bazel_test_results::label_to_prefix "${test_label}") readonly bazel_testlogs="${workdir}/src/bazel-testlogs" diff --git a/evergreen/resmoke_tests_execute_bazel.sh b/evergreen/resmoke_tests_execute_bazel.sh index 139d6826ea7..421927a1c64 100644 --- a/evergreen/resmoke_tests_execute_bazel.sh +++ b/evergreen/resmoke_tests_execute_bazel.sh @@ -10,6 +10,11 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" . "$DIR/prelude.sh" . "$DIR/bazel_evergreen_shutils.sh" +if [[ "${resmoke_disable_rbe_mirror}" == "true" && "${build_variant}" == "enterprise-amazon-linux2023-arm64-all-feature-flags-rbe" ]]; then + echo "Skipping: resmoke_disable_rbe_mirror=true on RBE mirror variant. We have force-disabled testing on this variant while resolving remote execution issues. Report to #ask-devprod-test-infrastructure if you have any issues." + exit 0 +fi + # Result tasks re-invoke this script to conditionally re-execute the test. The test should # execute unless the task was activated by the resmoke_tests task that already ran all tests. exit_early_if_result_task() {