Avoid secondary umbrella archive collisions in actions (backport #8653) (backport #8669) (#8679)

* Avoid secondary umbrella archive collisions in actions (backport #8653) (#8669)

* Avoid secondary umbrella archive collisions in actions (#8653)

* Store secondary umbrella archives used in mixed version tests

in a path which implies the erlang version used

* Infer the secondary umbrella otp version from the url

This avoids having two copies that need to be kept in sync

(cherry picked from commit 464182a)

# Conflicts:
#	.github/workflows/test-mixed-versions.yaml

* Fixup backport conflicts

---------

Co-authored-by: Rin Kuryloski <[email protected]>
(cherry picked from commit 89f668a)

# Conflicts:
#	.github/workflows/test-mixed-versions.yaml
#	bazel/bzlmod/secondary_umbrella.bzl

* Fixup backport conflicts

* Use 3.10.24 as the secondary umbrella

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Rin Kuryloski <[email protected]>

Author: mergify[bot]

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

@@ -31,9 +31,6 @@ jobs:
   ensure-mixed-version-archive:
     name: Prepare Artifacts
     runs-on: ubuntu-20.04
-    env:
-      # must be a version supported by builds on both this and the secondary umbrella branch
-      otp_version_id: 25
     steps:
     - name: CHECKOUT REPOSITORY
       uses: actions/checkout@v3
@@ -59,9 +56,13 @@ jobs:
         fi
         echo "exists=${exists}" | tee $GITHUB_ENV
 
+        OTP_VERSION_ID=${ARCHIVE_URL#*secondary-umbrellas/rbe-}
+        OTP_VERSION_ID=${OTP_VERSION_ID%*/package-generic-unix-for-mixed-version-testing-v*.tar.xz}
+        echo "otp_version_id=${OTP_VERSION_ID}" | tee -a $GITHUB_OUTPUT
+
         VERSION=${ARCHIVE_URL#*package-generic-unix-for-mixed-version-testing-v}
         VERSION=${VERSION%*.tar.xz}
-        echo "version=${VERSION}" | tee $GITHUB_OUTPUT
+        echo "version=${VERSION}" | tee -a $GITHUB_OUTPUT
     - name: CHECKOUT REPOSITORY (MIXED VERSION)
       if: env.exists != 'true'
       uses: actions/checkout@v3
@@ -96,15 +97,15 @@ jobs:
 
         sed -i"_orig" -E "/APP_VERSION/ s/3\.[0-9]+\.[0-9]+/${{ steps.check.outputs.version }}/" rabbitmq.bzl
         bazelisk build :package-generic-unix \
-          --config=rbe-${{ env.otp_version_id }} \
+          --config=rbe-${{ steps.check.outputs.otp_version_id }} \
           --test_build \
           --verbose_failures
 
         OUTPUT_DIR=${{ github.workspace }}/output
-        mkdir ${OUTPUT_DIR}
+        mkdir -p ${OUTPUT_DIR}/rbe-${{ steps.check.outputs.otp_version_id }}
         cp \
           bazel-bin/package-generic-unix.tar.xz \
-          ${OUTPUT_DIR}/package-generic-unix-for-mixed-version-testing-v${{ steps.check.outputs.version }}.tar.xz
+          ${OUTPUT_DIR}/rbe-${{ steps.check.outputs.otp_version_id }}/package-generic-unix-for-mixed-version-testing-v${{ steps.check.outputs.version }}.tar.xz
     - name: UPLOAD THE ARCHIVE TO S3
       if: env.exists != 'true'
       uses: jakejarvis/[email protected]

bazel/bzlmod/secondary_umbrella.bzl

@@ -28,8 +28,8 @@ def secondary_umbrella():
         name = "rabbitmq-server-generic-unix-3.10",
         build_file = "@//:BUILD.package_generic_unix",
         patch_cmds = [ADD_PLUGINS_DIR_BUILD_FILE],
-        strip_prefix = "rabbitmq_server-3.10.14",
+        strip_prefix = "rabbitmq_server-3.10.24",
         urls = [
-            "https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/package-generic-unix-for-mixed-version-testing-v3.10.14.tar.xz",
+            "https://rabbitmq-github-actions.s3.eu-west-1.amazonaws.com/secondary-umbrellas/rbe-25/package-generic-unix-for-mixed-version-testing-v3.10.24.tar.xz",
         ],
     )