Further refinements to .bazelrc

.bazelrc

@@ -1,5 +1,13 @@
 build --incompatible_strict_action_env
 
+build:buildbuddy --bes_results_url=https://app.buildbuddy.io/invocation/
+build:buildbuddy --bes_backend=grpcs://cloud.buildbuddy.io
+build:buildbuddy --remote_cache=grpcs://cloud.buildbuddy.io
+build:buildbuddy --remote_timeout=1200
+build:buildbuddy --grpc_keepalive_time=30s
+
+build:rbe --config=buildbuddy
+
 build:rbe --remote_executor=grpcs://cloud.buildbuddy.io
 build:rbe --host_platform=//:erlang_24_platform
 build:rbe --platforms=//:erlang_24_platform
@@ -16,11 +24,6 @@ build:rbe --@bazel-erlang//:erlang_version=24
 build:rbe --@bazel-erlang//:erlang_home=/usr/lib/erlang
 build:rbe --//:elixir_home=/usr/local
 
-build:rbe --bes_results_url=https://app.buildbuddy.io/invocation/
-build:rbe --bes_backend=grpcs://cloud.buildbuddy.io
-build:rbe --remote_cache=grpcs://cloud.buildbuddy.io
-build:rbe --remote_timeout=1200
-
 build:rbe --spawn_strategy=remote
 build:rbe --test_strategy=""
 build:rbe --jobs=50

.github/workflows/test.yaml

@@ -19,18 +19,18 @@ jobs:
         echo "${{ secrets.BUILDBUDDY_CERT }}" > buildbuddy-cert.pem
         echo "${{ secrets.BUILDBUDDY_KEY }}" > buildbuddy-key.pem
         cat << EOF >> user.bazelrc
+          build:buildbuddy --tls_client_certificate=buildbuddy-cert.pem
+          build:buildbuddy --tls_client_key=buildbuddy-key.pem
+
+          build:buildbuddy --build_metadata=ROLE=CI
+          build:buildbuddy --build_metadata=VISIBILITY=PUBLIC
+          build:buildbuddy --remote_instance_name=buildbuddy-io/buildbuddy/ci-${{ matrix.erlang_version }}
+
           build:rbe --host_platform=//:erlang_${{ matrix.erlang_version }}_platform
           build:rbe --platforms=//:erlang_${{ matrix.erlang_version }}_platform
           build:rbe --extra_execution_platforms=//:erlang_${{ matrix.erlang_version }}_platform
 
           build:rbe --@bazel-erlang//:erlang_version=${{ matrix.erlang_version }}
-
-          build:rbe --tls_client_certificate=buildbuddy-cert.pem
-          build:rbe --tls_client_key=buildbuddy-key.pem
-
-          build:rbe --build_metadata=ROLE=CI
-          build:rbe --build_metadata=VISIBILITY=PUBLIC
-          build:rbe --remote_instance_name=buildbuddy-io/buildbuddy/ci-${{ matrix.erlang_version }}
         EOF
     #! - name: Setup tmate session
     #!   uses: mxschmitt/action-tmate@v3
@@ -64,27 +64,23 @@ jobs:
         echo "${{ secrets.BUILDBUDDY_CERT }}" > buildbuddy-cert.pem
         echo "${{ secrets.BUILDBUDDY_KEY }}" > buildbuddy-key.pem
         cat << EOF >> user.bazelrc
+          build:buildbuddy --tls_client_certificate=buildbuddy-cert.pem
+          build:buildbuddy --tls_client_key=buildbuddy-key.pem
+
+          build:buildbuddy --build_metadata=ROLE=CI
+          build:buildbuddy --build_metadata=VISIBILITY=PRIVATE
+          build:buildbuddy --remote_instance_name=buildbuddy-io/buildbuddy/ci-exclusive-${{ matrix.erlang_version }}
+
           build --@bazel-erlang//:erlang_version=${{ matrix.erlang_version }}
           build --@bazel-erlang//:erlang_home=${ERLANG_HOME}
           build --//:elixir_home=${ELIXIR_HOME}
-
-          build --bes_results_url=https://app.buildbuddy.io/invocation/
-          build --bes_backend=grpcs://cloud.buildbuddy.io
-          build --remote_cache=grpcs://cloud.buildbuddy.io
-          build --tls_client_certificate=buildbuddy-cert.pem
-          build --tls_client_key=buildbuddy-key.pem
-          build --remote_timeout=1200
-
-          build --build_metadata=ROLE=CI
-          build --build_metadata=VISIBILITY=PRIVATE
-          build --remote_instance_name=buildbuddy-io/buildbuddy/ci-exclusive-${{ matrix.erlang_version }}
-          build --grpc_keepalive_time=30s
         EOF
     #! - name: Setup tmate session
     #!   uses: mxschmitt/action-tmate@v3
     - name: RUN EXCLUSIVE TESTS
       run: |
         bazelisk test //... \
+          --config=buildbuddy \
           --test_tag_filters=exclusive,-aws \
           --build_tests_only \
           --test_env RABBITMQ_CT_HELPERS_DELETE_UNUSED_NODES=true \

user-template.bazelrc

@@ -13,4 +13,4 @@ build --test_strategy=exclusive
 # don't re-run flakes automatically on the local machine
 build --flaky_test_attempts=1
 
-build:rbe --remote_header=x-buildbuddy-api-key=YOUR_API_KEY
+build:buildbuddy --remote_header=x-buildbuddy-api-key=YOUR_API_KEY