Skip to content

Update CI to support OCI images from main #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 27, 2025
Merged

Update CI to support OCI images from main #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ace537
ci: support for running OCI images from main or betas
Zerpet Aug 25, 2025
7c9607a
Use more precise language in comment
Zerpet Aug 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .ci/ubuntu/cluster/rmq/21-enable-management-collector.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions .ci/ubuntu/cluster/rmq/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions .ci/ubuntu/one-node/21-enable-management-collector.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions .ci/ubuntu/one-node/gha-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion Tests/Management/ManagementTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Loading