Skip to content

Commit 58517ab

Browse files
priteaupriteau
authored
Merge pull request #1796 from stackhpc/rabbitmq-migration-ci
CI: RabbitMQ upgrade to 4.1
2 parents 8eb8351 + e76e0e4 commit 58517ab

File tree

5 files changed

+72
-16
lines changed

5 files changed

+72
-16
lines changed

‎etc/kayobe/kolla-image-tags.yml‎

Lines changed: 52 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,39 +7,76 @@ kolla_image_tags:
77
rocky-9: 2024.1-rocky-9-20250716T041633
88
ubuntu-jammy: 2024.1-ubuntu-jammy-20241218T141809
99
ubuntu-noble: 2024.1-ubuntu-noble-20250404T150323
10+
barbican:
11+
rocky-9: 2024.1-rocky-9-20250717T094248
12+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250627T102805
13+
ubuntu-noble: 2024.1-ubuntu-noble-20250627T102805
14+
blazar:
15+
rocky-9: 2024.1-rocky-9-20250627T102805
16+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250627T102805
17+
ubuntu-noble: 2024.1-ubuntu-noble-20250627T102805
1018
bifrost:
1119
ubuntu-jammy: 2024.1-ubuntu-jammy-20250325T141125
20+
cinder:
21+
rocky-9: 2024.1-rocky-9-20250717T094248
22+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250627T102805
23+
ubuntu-noble: 2024.1-ubuntu-noble-20250627T102805
24+
cloudkitty:
25+
rocky-9: 2024.1-rocky-9-20250717T094248
26+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250627T102805
27+
ubuntu-noble: 2024.1-ubuntu-noble-20250627T102805
28+
designate:
29+
rocky-9: 2024.1-rocky-9-20250717T094248
30+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250627T102805
31+
ubuntu-noble: 2024.1-ubuntu-noble-20250627T102805
32+
heat:
33+
rocky-9: 2024.1-rocky-9-20250717T094248
34+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250627T102805
35+
ubuntu-noble: 2024.1-ubuntu-noble-20250627T102805
1236
glance:
1337
ubuntu-jammy: 2024.1-ubuntu-jammy-20250213T103134
1438
horizon:
1539
ubuntu-jammy: 2024.1-ubuntu-jammy-20250227T091118
1640
ironic:
17-
ubuntu-jammy: 2024.1-ubuntu-jammy-20250213T110505
41+
rocky-9: 2024.1-rocky-9-20250717T094248
42+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250627T102805
43+
ubuntu-noble: 2024.1-ubuntu-noble-20250627T102805
1844
ironic_dnsmasq:
45+
rocky-9: 2024.1-rocky-9-20250716T041633
1946
ubuntu-jammy: 2024.1-ubuntu-jammy-20241218T141809
47+
ubuntu-noble: 2024.1-ubuntu-noble-20250404T150323
2048
ironic_prometheus_exporter:
2149
ubuntu-jammy: 2024.1-ubuntu-jammy-20250124T081816
50+
keystone:
51+
rocky-9: 2024.1-rocky-9-20250717T094248
52+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250627T102805
53+
ubuntu-noble: 2024.1-ubuntu-noble-20250627T102805
2254
kolla_toolbox:
2355
ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
2456
ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
2557
magnum:
26-
ubuntu-jammy: 2024.1-ubuntu-jammy-20250522T143506
27-
ubuntu-noble: 2024.1-ubuntu-noble-20250522T143506
58+
rocky-9: 2024.1-rocky-9-20250717T094248
59+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250627T102805
60+
ubuntu-noble: 2024.1-ubuntu-noble-20250627T102805
2861
manila:
29-
ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
30-
ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
62+
rocky-9: 2024.1-rocky-9-20250717T094248
63+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250627T102805
64+
ubuntu-noble: 2024.1-ubuntu-noble-20250627T102805
3165
neutron:
32-
ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
33-
ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
66+
rocky-9: 2024.1-rocky-9-20250717T094248
67+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250627T102805
68+
ubuntu-noble: 2024.1-ubuntu-noble-20250627T102805
3469
neutron_bgp_dragent:
3570
ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
3671
ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
3772
nova:
38-
ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
39-
ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
73+
rocky-9: 2024.1-rocky-9-20250717T094248
74+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250627T102805
75+
ubuntu-noble: 2024.1-ubuntu-noble-20250627T102805
4076
octavia:
41-
ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
42-
ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
77+
rocky-9: 2024.1-rocky-9-20250717T094248
78+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250627T102805
79+
ubuntu-noble: 2024.1-ubuntu-noble-20250627T102805
4380
openvswitch:
4481
ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
4582
ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
@@ -50,3 +87,7 @@ kolla_image_tags:
5087
ubuntu-jammy: 2024.1-ubuntu-jammy-20250219T145255
5188
prometheus_alertmanager:
5289
ubuntu-jammy: 2024.1-ubuntu-jammy-20250422T103147
90+
rabbitmq:
91+
rocky-9: 2024.1-rocky-9-20250722T083943
92+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250722T083943
93+
ubuntu-noble: 2024.1-ubuntu-noble-20250722T083943

‎etc/kayobe/pulp-repo-versions.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,13 @@ stackhpc_pulp_repo_epel_9_aarch64_version: 20250615T015805
2121
stackhpc_pulp_repo_grafana_version: 20250615T005738
2222
stackhpc_pulp_repo_opensearch_2_x_version: 20250430T014638
2323
stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20250430T014638
24-
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20241217T002152
25-
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_aarch64_version: 20241213T015928
26-
stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20241217T002152
24+
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20250718T004955
25+
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_aarch64_version: 20250721T162732
26+
stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20250708T003546
2727
stackhpc_pulp_repo_rhel_9_influxdb_version: 20241217T002152
2828
stackhpc_pulp_repo_rhel_9_influxdb_aarch64_version: 20241217T012754
2929
stackhpc_pulp_repo_rhel_9_mariadb_10_11_version: 20241102T004913
3030
stackhpc_pulp_repo_rhel_9_mariadb_10_11_aarch64_version: 20241102T015940
31-
stackhpc_pulp_repo_rhel_9_rabbitmq_erlang_version: 20240711T091318
32-
stackhpc_pulp_repo_rhel_9_rabbitmq_server_version: 20240711T091318
3331
stackhpc_pulp_repo_rhel_9_treasuredata_5_version: 20241115T002028
3432
stackhpc_pulp_repo_rhel_9_treasuredata_5_aarch64_version: 20241115T010217
3533
stackhpc_pulp_repo_rocky_9_1_appstream_version: 20231207T013715

‎etc/kayobe/pulp.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -601,6 +601,7 @@ stackhpc_pulp_images_kolla:
601601
- prometheus-openstack-exporter
602602
- prometheus-v2-server
603603
- rabbitmq
604+
- rabbitmq-4-1
604605
- redis
605606
- redis-sentinel
606607

‎releasenotes/notes/add-rabbitmq-4-1-support-caracal-ddb7271c83b75897.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
features:
3+
- |
4+
Added RabbitMQ 4.1 support.
5+
Added a step to upgrade RabbitMQ from version 3.13 to 4.1 after queue
6+
migration in ``upgrade-prerequisites.sh``.
7+
Multinode upgrade CI will go through this when run with major upgrade
8+
enabled.

‎tools/upgrade-prerequisites.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@ function prechecks() {
1717
fi
1818
}
1919

20+
function rabbit_upgrade() {
21+
# Ensure RabbitMQ is upgraded to 4.1
22+
if kayobe overcloud host command run -l controllers -b --command "docker exec rabbitmq rabbitmqctl --version | grep -F 3.13." --show-output; then
23+
kayobe kolla ansible run "rabbitmq-upgrade 4.1" --kolla-skip-tags rabbitmq-version-check
24+
fi
25+
}
26+
2027
function rabbit_migration() {
2128
if kayobe overcloud host command run -l controllers -b --command "docker exec rabbitmq rabbitmqctl list_queues durable | grep false"; then
2229
# Set feature flaga, execute RabbitMQ queue migration script, unset feature flags (to avoid git conflicts)
@@ -43,3 +50,4 @@ function rabbit_migration() {
4350

4451
prechecks
4552
rabbit_migration
53+
rabbit_upgrade

0 commit comments

Comments
 (0)