Merge pull request #132 from rabbitmq/update-ci

Update CI to support OCI images from main

Author: Zerpet

.ci/ubuntu/cluster/rmq/21-enable-management-collector.conf

@@ -0,0 +1,3 @@
+# This file might be required to test with images built from main.
+# Images in pivotalrabbitmq/rabbitmq disable the metrics collector by default.
+management_agent.disable_metrics_collector = false

.ci/ubuntu/cluster/rmq/Dockerfile

@@ -12,5 +12,6 @@ COPY --chown=rabbitmq:rabbitmq --chmod=0644 enabled_plugins /etc/rabbitmq/enable
 COPY --chown=rabbitmq:rabbitmq rabbitmq-env.conf /etc/rabbitmq/rabbitmq-env.conf
 COPY --chown=rabbitmq:rabbitmq rabbitmq.conf /etc/rabbitmq/rabbitmq.conf
 COPY --chown=rabbitmq:rabbitmq advanced.config /etc/rabbitmq/advanced.config
+COPY --chown=rabbitmq:rabbitmq 21-enable-management-collector.conf /etc/rabbitmq/conf.d/21-enable-management-collector.conf
 
 EXPOSE 4369 5671 5672 15672 15692 25672 35672-35682

.ci/ubuntu/one-node/21-enable-management-collector.conf

@@ -0,0 +1,3 @@
+# This file is required to test with images built from main.
+# Images in pivotalrabbitmq/rabbitmq disable the metrics collector by default.
+management_agent.disable_metrics_collector = false

.ci/ubuntu/one-node/gha-setup.sh

@@ -90,6 +90,7 @@ function start_rabbitmq
         --volume "$GITHUB_WORKSPACE/.ci/ubuntu/one-node/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf:ro" \
         --volume "$GITHUB_WORKSPACE/.ci/certs:/etc/rabbitmq/certs:ro" \
         --volume "$GITHUB_WORKSPACE/.ci/ubuntu/one-node/advanced.config:/etc/rabbitmq/advanced.config:ro" \
+        --volume "$GITHUB_WORKSPACE/.ci/ubuntu/one-node/21-enable-management-collector.conf:/etc/rabbitmq/conf.d/21-enable-management-collector.conf:ro" \
         --volume "$GITHUB_WORKSPACE/.ci/ubuntu/log:/var/log/rabbitmq" \
         "$rabbitmq_image"
 }

Tests/Management/ManagementTests.cs

@@ -453,6 +453,6 @@ public async Task PurgeQueueShouldReturnErrorForStream()
         await queueSpec.DeclareAsync();
         await PublishAsync(queueSpec, 19);
         await WaitUntilQueueMessageCount(_queueName, 19);
-        await Assert.ThrowsAsync<BadRequestException>(() => queueSpec.PurgeAsync());
+        await Assert.ThrowsAsync<BadRequestException>(queueSpec.PurgeAsync);
     }
 }