Merge pull request #9229 from rabbitmq/rin/re-tag-exclusive-tests

Use the no-remote-exec instead of exclusive tag for some tests

Author: HoloRin

.bazelrc

@@ -33,7 +33,7 @@ build:rbe --config=buildbuddy
 
 build:rbe --remote_executor=grpcs://remote.buildbuddy.io
 
-build:rbe --spawn_strategy=remote
+build:rbe --spawn_strategy=remote,local
 build:rbe --test_strategy=""
 build:rbe --jobs=50
 

.github/workflows/test-erlang-git.yaml

@@ -42,6 +42,6 @@ jobs:
         sudo ethtool -K eth0 tso off gso off gro off tx off rx off lro off
         bazelisk test //... \
           --config=rbe \
-          --test_tag_filters=-mixed-version-cluster,-exclusive,-aws,-docker \
+          --test_tag_filters=-mixed-version-cluster,-aws,-docker \
           --build_tests_only \
           --verbose_failures

.github/workflows/test-mixed-versions.yaml

@@ -162,69 +162,12 @@ jobs:
         sudo ethtool -K eth0 tso off gso off gro off tx off rx off lro off
         bazelisk test //... \
           --config=rbe-${{ matrix.otp_version_id }} \
-          --test_tag_filters=mixed-version-cluster,-exclusive,-aws,-docker \
+          --test_tag_filters=mixed-version-cluster,-aws,-docker \
           --build_tests_only \
           --verbose_failures
-  test-exclusive-mixed-versions:
-    name: Test (Exclusive Tests with Mixed Version Cluster)
-    runs-on: ubuntu-20.04
-    needs: ensure-mixed-version-archive
-    strategy:
-      matrix:
-        include:
-        - erlang_version: "25.3"
-          elixir_version: 1.14.5
-    timeout-minutes: 60
-    steps:
-    - name: CHECKOUT REPOSITORY
-      uses: actions/checkout@v3
-    - name: CONFIGURE OTP & ELIXIR
-      uses: erlef/setup-beam@v1.16
-      with:
-        otp-version: ${{ matrix.erlang_version }}
-        elixir-version: ${{ matrix.elixir_version }}
-    - name: MOUNT BAZEL CACHE
-      uses: actions/cache@v3.3.1
-      with:
-        path: "/home/runner/repo-cache/"
-        key: ${{ runner.os }}-repo-cache-${{ hashFiles('MODULE.bazel','WORKSPACE','bazel/bzlmod/secondary_umbrella.bzl') }}
-        restore-keys: |
-          ${{ runner.os }}-repo-cache-
-    - name: CONFIGURE BAZEL
-      run: |
-        ERLANG_HOME="$(dirname $(dirname $(which erl)))"
-        ELIXIR_HOME="$(dirname $(dirname $(which iex)))"
-        if [ -n "${{ secrets.BUILDBUDDY_API_KEY }}" ]; then
-        cat << EOF >> user.bazelrc
-          build:buildbuddy --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_API_KEY }}
-        EOF
-        fi
-        cat << EOF >> user.bazelrc
-          build:buildbuddy --build_metadata=ROLE=CI
-          build:buildbuddy --build_metadata=VISIBILITY=PRIVATE
-          build:buildbuddy --repository_cache=/home/runner/repo-cache/
-          build:buildbuddy --color=yes
-          build:buildbuddy --disk_cache=
-
-          build --@rules_erlang//:erlang_version=${{ matrix.erlang_version }}
-          build --@rules_erlang//:erlang_home=${ERLANG_HOME}
-          build --//:elixir_home=${ELIXIR_HOME}
-        EOF
-    #! - name: Setup tmate session
-    #!   uses: mxschmitt/action-tmate@v3
-    - name: RUN EXCLUSIVE TESTS
-      run: |
-        MIXED_EXCLUSIVE_TESTS=$(bazel query 'attr(tags, "mixed-version-cluster", attr(tags, "exclusive", tests(//...)))')
-        bazelisk test $MIXED_EXCLUSIVE_TESTS \
-          --config=buildbuddy \
-          --test_tag_filters=-aws,-docker \
-          --build_tests_only \
-          --test_env RABBITMQ_CT_HELPERS_DELETE_UNUSED_NODES=true \
-          --verbose_failures
   summary-mixed-versions:
     needs:
     - test-mixed-versions
-    - test-exclusive-mixed-versions
     runs-on: ubuntu-latest
     steps:
     - name: SUMMARY

.github/workflows/test.yaml

@@ -72,70 +72,12 @@ jobs:
         sudo ethtool -K eth0 tso off gso off gro off tx off rx off lro off
         bazelisk test //... \
           --config=rbe-${{ matrix.otp_version_id }} \
-          --test_tag_filters=-exclusive,-aws,-docker,-mixed-version-cluster \
+          --test_tag_filters=-aws,-docker,-mixed-version-cluster \
           --build_tests_only \
           --verbose_failures
-  test-exclusive:
-    name: Test (Exclusive Tests)
-    runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - erlang_version: "25.3"
-          elixir_version: 1.14.5
-        - erlang_version: "26.0"
-          elixir_version: 1.14.5
-    timeout-minutes: 60
-    steps:
-    - name: CHECKOUT REPOSITORY
-      uses: actions/checkout@v3
-    - name: CONFIGURE OTP & ELIXIR
-      uses: erlef/setup-beam@v1.16
-      with:
-        otp-version: ${{ matrix.erlang_version }}
-        elixir-version: ${{ matrix.elixir_version }}
-    - name: MOUNT BAZEL CACHE
-      uses: actions/cache@v3.3.1
-      with:
-        path: "/home/runner/repo-cache/"
-        key: ${{ runner.os }}-repo-cache-${{ hashFiles('MODULE.bazel','WORKSPACE','bazel/bzlmod/secondary_umbrella.bzl') }}
-        restore-keys: |
-          ${{ runner.os }}-repo-cache-
-    - name: CONFIGURE BAZEL
-      run: |
-        ERLANG_HOME="$(dirname $(dirname $(which erl)))"
-        ELIXIR_HOME="$(dirname $(dirname $(which iex)))"
-        if [ -n "${{ secrets.BUILDBUDDY_API_KEY }}" ]; then
-        cat << EOF >> user.bazelrc
-          build:buildbuddy --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_API_KEY }}
-        EOF
-        fi
-        cat << EOF >> user.bazelrc
-          build:buildbuddy --build_metadata=ROLE=CI
-          build:buildbuddy --build_metadata=VISIBILITY=PUBLIC
-          build:buildbuddy --repository_cache=/home/runner/repo-cache/
-          build:buildbuddy --color=yes
-          build:buildbuddy --disk_cache=
-
-          build --@rules_erlang//:erlang_version=${{ matrix.erlang_version }}
-          build --@rules_erlang//:erlang_home=${ERLANG_HOME}
-          build --//:elixir_home=${ELIXIR_HOME}
-        EOF
-    #! - name: Setup tmate session
-    #!   uses: mxschmitt/action-tmate@v3
-    - name: RUN EXCLUSIVE TESTS
-      run: |
-        bazelisk test //... \
-          --config=buildbuddy \
-          --test_tag_filters=exclusive,-aws,-docker,-mixed-version-cluster \
-          --build_tests_only \
-          --test_env RABBITMQ_CT_HELPERS_DELETE_UNUSED_NODES=true \
-          --verbose_failures
   summary-test:
     needs:
     - test
-    - test-exclusive
     runs-on: ubuntu-latest
     steps:
     - name: SUMMARY

deps/rabbit/BUILD.bazel

@@ -478,7 +478,7 @@ rabbitmq_integration_suite(
     shard_count = 2,
     # The enabling_* tests chmod files and then expect writes to be blocked.
     # This probably doesn't work because we are root in the remote docker image.
-    tags = ["exclusive"],
+    tags = ["no-remote-exec"],
     runtime_deps = [
         "//deps/rabbit/test/feature_flags_SUITE_data/my_plugin:erlang_app",
     ],