From 91b4d0f5b17b20faed32e1ae42c6a28575e1ad2c Mon Sep 17 00:00:00 2001
From: Michael Klishin <michael@clojurewerkz.org>
Date: Wed, 19 Jun 2024 13:31:16 -0400
Subject: [PATCH] Resolve a conflict #11488 #11478 #11500

---
 .../perform-bazel-execution-comparison.yaml   | 111 ------------------
 bazel/bzlmod/secondary_umbrella.bzl           |  14 +--
 2 files changed, 1 insertion(+), 124 deletions(-)
 delete mode 100644 .github/workflows/perform-bazel-execution-comparison.yaml

diff --git a/.github/workflows/perform-bazel-execution-comparison.yaml b/.github/workflows/perform-bazel-execution-comparison.yaml
deleted file mode 100644
index 08f36249d74f..000000000000
--- a/.github/workflows/perform-bazel-execution-comparison.yaml
+++ /dev/null
@@ -1,111 +0,0 @@
-name: Gather Bazel Execution Logs
-on:
-  workflow_dispatch:
-    inputs:
-      target:
-        description: 'A bazel label representing the test target'
-        required: true
-        default: '//deps/rabbit:rabbit_stream_queue_SUITE'
-jobs:
-  run-a:
-    name: Run A
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        erlang_version:
-        - "25"
-        include:
-        - erlang_version: "25"
-          cache_name: ci-bazel-cache-analysis
-    timeout-minutes: 120
-    steps:
-    - name: CHECKOUT REPOSITORY
-      uses: actions/checkout@v3
-    - name: CONFIGURE BAZEL
-      run: |
-        cat << EOF >> user.bazelrc
-          build:buildbuddy --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_API_KEY }}
-
-          build:buildbuddy --build_metadata=ROLE=CI
-          build:buildbuddy --remote_instance_name=buildbuddy-io/buildbuddy/ci-${{ matrix.cache_name }}
-        EOF
-    - name: RUN TESTS
-      run: |
-        sudo sysctl -w net.ipv4.tcp_keepalive_time=60
-        sudo ethtool -K eth0 tso off gso off gro off tx off rx off lro off
-        bazelisk test ${{ github.event.inputs.target }} \
-          --config=rbe-${{ matrix.erlang_version }} \
-          --execution_log_binary_file=/tmp/exec.log
-    - name: SAVE EXECUTION LOG BINARY
-      uses: actions/upload-artifact@v3.1.2
-      with:
-        name: execution-log-binary-A
-        path: /tmp/exec.log
-  run-b:
-    name: Run B
-    needs: run-a
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        erlang_version:
-        - "25"
-        include:
-        - erlang_version: "25"
-          cache_name: ci-bazel-cache-analysis
-    timeout-minutes: 120
-    steps:
-    - name: CHECKOUT REPOSITORY
-      uses: actions/checkout@v3
-    - name: CONFIGURE BAZEL
-      run: |
-        cat << EOF >> user.bazelrc
-          build:buildbuddy --remote_header=x-buildbuddy-api-key=${{ secrets.BUILDBUDDY_API_KEY }}
-
-          build:buildbuddy --build_metadata=ROLE=CI
-          build:buildbuddy --remote_instance_name=buildbuddy-io/buildbuddy/ci-${{ matrix.cache_name }}
-        EOF
-    - name: RUN TESTS
-      run: |
-        sudo sysctl -w net.ipv4.tcp_keepalive_time=60
-        sudo ethtool -K eth0 tso off gso off gro off tx off rx off lro off
-        bazelisk test ${{ github.event.inputs.target }} \
-          --config=rbe-${{ matrix.erlang_version }} \
-          --execution_log_binary_file=/tmp/exec.log
-    - name: SAVE EXECUTION LOG BINARY
-      uses: actions/upload-artifact@v3.1.2
-      with:
-        name: execution-log-binary-B
-        path: /tmp/exec.log
-  parse-logs:
-    name: Parse Logs
-    needs: [run-a, run-b]
-    runs-on: ubuntu-22.04
-    steps:
-    - name: CHECKOUT BAZEL
-      uses: actions/checkout@v3
-      with:
-        repository: bazelbuild/bazel
-        path: bazel
-    - name: MOUNT BAZEL CACHE
-      uses: actions/cache@v3.2.5
-      with:
-        path: "/home/runner/.cache/bazel"
-        key: bazel
-    - name: BUILD EXECLOG PARSER
-      working-directory: bazel
-      run: |
-        bazelisk build src/tools/execlog:parser
-    - name: FETCH LOGS
-      uses: actions/download-artifact@v3
-    - name: PARSE LOGS
-      run: |
-        bazel/bazel-bin/src/tools/execlog/parser \
-          --log_path=./execution-log-binary-A/exec.log \
-          --log_path=./execution-log-binary-B/exec.log \
-          --output_path=/tmp/execution-log-binary-A.log.txt \
-          --output_path=/tmp/execution-log-binary-B.log.txt
-    - name: SAVE PARSED LOGS
-      uses: actions/upload-artifact@v3.1.2
-      with:
-        name: parsed-logs
-        path: /tmp/execution-log-binary-*.log.txt
diff --git a/bazel/bzlmod/secondary_umbrella.bzl b/bazel/bzlmod/secondary_umbrella.bzl
index ef5623a69ed8..a7b67436d0e8 100644
--- a/bazel/bzlmod/secondary_umbrella.bzl
+++ b/bazel/bzlmod/secondary_umbrella.bzl
@@ -31,18 +31,6 @@ def secondary_umbrella():
         strip_prefix = "rabbitmq_server-3.11.18",
         # This file is produced just in time by the test-mixed-versions.yaml GitHub Actions workflow.
         urls = [
-<<<<<<< HEAD
-<<<<<<< HEAD
-            "https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/rbe-25_0/package-generic-unix-for-mixed-version-testing-v3.11.18.tar.xz",
-=======
-<<<<<<< HEAD
-            "https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/rbe-25_3/package-generic-unix-for-mixed-version-testing-v3.12.6.tar.xz",
-=======
-            "https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/26.1/package-generic-unix-for-mixed-version-testing-v3.13.1.tar.xz",
->>>>>>> a2709dfd05 (Remove remaining buildbuddy usage)
->>>>>>> b38dc84db5 (Remove remaining buildbuddy usage)
-=======
-            "https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/25.3/package-generic-unix-for-mixed-version-testing-v3.12.6.tar.xz",
->>>>>>> f28089177a (fixup backport)
+            "https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/rbe-25_0/package-generic-unix-for-mixed-version-testing-v3.11.18.tar.xz"
         ],
     )