Merge pull request #9878 from rabbitmq/mergify/bp/v3.12.x/pr-9877

Adjust strategy flags for bazel (backport #9877)

Author: HoloRin

.bazelrc

@@ -36,8 +36,7 @@ build:rbe --config=buildbuddy
 
 build:rbe --remote_executor=grpcs://remote.buildbuddy.io
 
-build:rbe --spawn_strategy=remote,local
-build:rbe --test_strategy=""
+build:rbe --strategy=TestRunner=remote,worker,sandboxed,local
 build:rbe --jobs=50
 
 build:rbe --crosstool_top=@rbe//cc:toolchain

user-template.bazelrc

@@ -1,7 +1,7 @@
 # rabbitmqctl wait shells out to 'ps', which is broken in the bazel macOS
 # sandbox (https://github.com/bazelbuild/bazel/issues/7448)
-# adding "--spawn_strategy=local" to the invocation is a workaround
-build --spawn_strategy=local
+# adding "--strategy=TestRunner=local" to the invocation is a workaround
+build --strategy=TestRunner=local
 
 # --experimental_strict_action_env breaks memory size detection on macOS,
 # so turn it off for local runs