Use matrix to test broker alphas

(cherry picked from commit aeb3efa)

Author: acogoluegnes

.github/workflows/test-native-image.yml

@@ -6,8 +6,7 @@ on:
   workflow_dispatch:
 
 env:
-  RABBITMQ_IMAGE_TAG: 3.11
-  RABBITMQ_IMAGE: rabbitmq
+  RABBITMQ_IMAGE: 'rabbitmq:3.11'
 
 jobs:
   build:
@@ -64,4 +63,4 @@ jobs:
         working-directory: rabbitmq-graal-vm-test
         run: ./rabbitmq-graal-vm-test-full
       - name: Stop broker
-        run: docker stop rabbitmq && docker rm rabbitmq
+        run: docker stop rabbitmq && docker rm rabbitmq

.github/workflows/test-3.11-alpha.yml renamed to .github/workflows/test-rabbitmq-alphas.yml

@@ -11,14 +11,13 @@ on:
       - 5.x.x-stable
   workflow_dispatch:
 
-env:
-  RABBITMQ_IMAGE_TAG: 3.11
-  RABBITMQ_IMAGE: pivotalrabbitmq/rabbitmq-dev
-
 jobs:
   build:
     runs-on: ubuntu-22.04
-
+    strategy:
+      matrix:
+        rabbitmq-image: [ 'pivotalrabbitmq/rabbitmq:v3.11.x-otp-max-bazel', 'pivotalrabbitmq/rabbitmq:v3.12.x-otp-max-bazel' ]
+    name:  Test against ${{ matrix.rabbitmq-image }}
     steps:
       - uses: actions/checkout@v3
       - name: Checkout tls-gen
@@ -38,6 +37,8 @@ jobs:
           cache: 'maven'
       - name: Start cluster
         run: ci/start-cluster.sh
+        env:
+          RABBITMQ_IMAGE: ${{ matrix.rabbitmq-image }}
       - name: Get dependencies
         run: make deps
       - name: Test with NIO
@@ -57,4 +58,4 @@ jobs:
       - name: Stop broker A
         run: docker stop rabbitmq && docker rm rabbitmq
       - name: Stop broker B
-        run: docker stop hare && docker rm hare
+        run: docker stop hare && docker rm hare

.github/workflows/test-supported-java-versions-5.x.yml

@@ -6,8 +6,7 @@ on:
   workflow_dispatch:
 
 env:
-  RABBITMQ_IMAGE_TAG: 3.11
-  RABBITMQ_IMAGE: rabbitmq
+  RABBITMQ_IMAGE: 'rabbitmq:3.11'
 
 jobs:
   build:
@@ -56,4 +55,4 @@ jobs:
           -Dit.test=ClientTestSuite,FunctionalTestSuite,ServerTestSuite,SslTestSuite \
           --no-transfer-progress
       - name: Stop broker
-        run: docker stop rabbitmq && docker rm rabbitmq
+        run: docker stop rabbitmq && docker rm rabbitmq

.github/workflows/test-supported-java-versions-main.yml

@@ -6,8 +6,7 @@ on:
   workflow_dispatch:
 
 env:
-  RABBITMQ_IMAGE_TAG: 3.11
-  RABBITMQ_IMAGE: rabbitmq
+  RABBITMQ_IMAGE: 'rabbitmq:3.11'
 
 jobs:
   build:
@@ -54,4 +53,4 @@ jobs:
           -Dit.test=ClientTestSuite,FunctionalTestSuite,ServerTestSuite,SslTestSuite \
           --no-transfer-progress
       - name: Stop broker
-        run: docker stop rabbitmq && docker rm rabbitmq
+        run: docker stop rabbitmq && docker rm rabbitmq

.github/workflows/test-3.11-stable.yml renamed to .github/workflows/test.yml

@@ -10,8 +10,7 @@ on:
   workflow_dispatch:
 
 env:
-  RABBITMQ_IMAGE_TAG: 3.11
-  RABBITMQ_IMAGE: rabbitmq
+  RABBITMQ_IMAGE: 'rabbitmq:3.11'
 
 jobs:
   build:
@@ -67,4 +66,4 @@ jobs:
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
-          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

ci/start-broker.sh

@@ -2,8 +2,7 @@
 
 LOCAL_SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-RABBITMQ_IMAGE_TAG=${RABBITMQ_IMAGE_TAG:-3.11}
-RABBITMQ_IMAGE=${RABBITMQ_IMAGE:-rabbitmq}
+RABBITMQ_IMAGE=${RABBITMQ_IMAGE:-rabbitmq:3.11}
 
 wait_for_message() {
   while ! docker logs "$1" | grep -q "$2";
@@ -27,15 +26,15 @@ chmod -R o+r rabbitmq-configuration/tls/*
 ./mvnw -q clean resources:testResources -Dtest-tls-certs.dir=/etc/rabbitmq/tls
 cp target/test-classes/[email protected] rabbitmq-configuration/rabbitmq.config
 
-echo "Running RabbitMQ ${RABBITMQ_IMAGE}:${RABBITMQ_IMAGE_TAG}"
+echo "Running RabbitMQ ${RABBITMQ_IMAGE}"
 
 docker rm -f rabbitmq 2>/dev/null || echo "rabbitmq was not running"
 docker run -d --name rabbitmq \
     --network host \
     -v "${PWD}"/rabbitmq-configuration:/etc/rabbitmq \
-    "${RABBITMQ_IMAGE}":"${RABBITMQ_IMAGE_TAG}"
+    "${RABBITMQ_IMAGE}"
 
 wait_for_message rabbitmq "completed with"
 
 docker exec rabbitmq rabbitmq-diagnostics erlang_version
-docker exec rabbitmq rabbitmqctl version
+docker exec rabbitmq rabbitmqctl version

ci/start-cluster.sh

@@ -2,8 +2,7 @@
 
 LOCAL_SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-RABBITMQ_IMAGE_TAG=${RABBITMQ_IMAGE_TAG:-3.11}
-RABBITMQ_IMAGE=${RABBITMQ_IMAGE:-rabbitmq}
+RABBITMQ_IMAGE=${RABBITMQ_IMAGE:-rabbitmq:3.11}
 
 wait_for_message() {
   while ! docker logs "$1" | grep -q "$2";
@@ -28,7 +27,7 @@ chmod -R o+r rabbitmq-configuration/tls/*
 cp target/test-classes/[email protected] rabbitmq-configuration/[email protected]
 cp target/test-classes/[email protected] rabbitmq-configuration/[email protected]
 
-echo "Running RabbitMQ ${RABBITMQ_IMAGE}:${RABBITMQ_IMAGE_TAG}"
+echo "Running RabbitMQ ${RABBITMQ_IMAGE}"
 
 docker rm -f rabbitmq 2>/dev/null || echo "rabbitmq was not running"
 docker run -d --name rabbitmq \
@@ -38,7 +37,7 @@ docker run -d --name rabbitmq \
     --env RABBITMQ_NODENAME=rabbit@$(hostname) \
     --env RABBITMQ_NODE_PORT=5672 \
     --env RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-setcookie do-not-do-this-in-production" \
-    "${RABBITMQ_IMAGE}":"${RABBITMQ_IMAGE_TAG}"
+    "${RABBITMQ_IMAGE}"
 
 # for CLI commands to share the same cookie
 docker exec rabbitmq bash -c "echo 'do-not-do-this-in-production' > /var/lib/rabbitmq/.erlang.cookie"
@@ -53,7 +52,7 @@ docker run -d --name hare \
     --env RABBITMQ_NODENAME=hare@$(hostname) \
     --env RABBITMQ_NODE_PORT=5673 \
     --env RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-setcookie do-not-do-this-in-production" \
-    "${RABBITMQ_IMAGE}":"${RABBITMQ_IMAGE_TAG}"
+    "${RABBITMQ_IMAGE}"
 
 # for CLI commands to share the same cookie
 docker exec hare bash -c "echo 'do-not-do-this-in-production' > /var/lib/rabbitmq/.erlang.cookie"
@@ -77,4 +76,4 @@ docker exec hare rabbitmqctl --node hare@$(hostname) await_startup
 docker exec rabbitmq rabbitmq-diagnostics --node rabbit@$(hostname) erlang_version
 docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) version
 docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) status
-docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) cluster_status
+docker exec rabbitmq rabbitmqctl --node rabbit@$(hostname) cluster_status