Skip to content

Commit 599ce98

Browse files
bbezakbbezak
authored
rocky/aarch64: switch to versioned Erlang 26/27 repos (#1870)
Replace unversioned aarch64 Erlang COPR with erlang-26 and erlang-27 Aligns with Kolla change [1]. [1] https://review.opendev.org/c/openstack/kolla/+/959692 (cherry picked from commit 52ad7b2) Signed-off-by: Bartosz Bezak <bartosz@stackhpc.com>
1 parent 183544d commit 599ce98

File tree

9 files changed

+40
-7
lines changed

9 files changed

+40
-7
lines changed

‎etc/kayobe/environments/ci-aio/stackhpc-ci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ stackhpc_repo_mirror_password: !vault |
2424
# Build against released Pulp repository versions.
2525
stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}"
2626
stackhpc_repo_rhel9_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_version }}"
27+
stackhpc_repo_rhel9_rabbitmq_erlang_26_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_26_version }}"
28+
stackhpc_repo_rhel9_rabbitmq_erlang_27_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_27_version }}"
2729
stackhpc_repo_rhel9_rabbitmq_server_version: "{{ stackhpc_pulp_repo_rhel9_rabbitmq_server_version }}"
2830
stackhpc_repo_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_ubuntu_jammy_version }}"
2931
stackhpc_repo_ubuntu_jammy_security_version: "{{ stackhpc_pulp_repo_ubuntu_jammy_security_version }}"

‎etc/kayobe/environments/ci-builder/stackhpc-ci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ stackhpc_repo_mirror_password: !vault |
5050
# Build against released Pulp repository versions.
5151
stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}"
5252
stackhpc_repo_rhel9_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_version }}"
53+
stackhpc_repo_rhel9_rabbitmq_erlang_26_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_26_version }}"
54+
stackhpc_repo_rhel9_rabbitmq_erlang_27_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_27_version }}"
5355
stackhpc_repo_rhel9_rabbitmq_server_version: "{{ stackhpc_pulp_repo_rhel9_rabbitmq_server_version }}"
5456
stackhpc_repo_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_ubuntu_jammy_version }}"
5557
stackhpc_repo_ubuntu_jammy_security_version: "{{ stackhpc_pulp_repo_ubuntu_jammy_security_version }}"

‎etc/kayobe/environments/ci-multinode/stackhpc-ci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ stackhpc_repo_mirror_password: !vault |
2424
# Build and deploy released Pulp repository versions.
2525
stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}"
2626
stackhpc_repo_rhel9_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_version }}"
27+
stackhpc_repo_rhel9_rabbitmq_erlang_26_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_26_version }}"
28+
stackhpc_repo_rhel9_rabbitmq_erlang_27_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_27_version }}"
2729
stackhpc_repo_rhel9_rabbitmq_server_version: "{{ stackhpc_pulp_repo_rhel9_rabbitmq_server_version }}"
2830
stackhpc_repo_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_ubuntu_jammy_version }}"
2931
stackhpc_repo_ubuntu_jammy_security_version: "{{ stackhpc_pulp_repo_ubuntu_jammy_security_version }}"

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ kolla_image_tags:
5454
ubuntu-jammy: 2024.1-ubuntu-jammy-20250627T102805
5555
ubuntu-noble: 2024.1-ubuntu-noble-20250627T102805
5656
kolla_toolbox:
57+
rocky-9: 2024.1-rocky-9-20250908T155427
5758
ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
5859
ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
5960
magnum:
@@ -94,6 +95,6 @@ kolla_image_tags:
9495
ubuntu-jammy: 2024.1-ubuntu-jammy-20250819T151035
9596
ubuntu-noble: 2024.1-ubuntu-noble-20250819T151035
9697
rabbitmq:
97-
rocky-9: 2024.1-rocky-9-20250722T083943
98+
rocky-9: 2024.1-rocky-9-20250908T155427
9899
ubuntu-jammy: 2024.1-ubuntu-jammy-20250722T083943
99100
ubuntu-noble: 2024.1-ubuntu-noble-20250722T083943

‎etc/kayobe/kolla.yml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,14 @@ stackhpc_rocky_9_third_party_repos:
227227
file: "CentOS-Ceph-Reef.repo"
228228
tag: "centos-ceph-reef"
229229
- url: "{{ stackhpc_repo_rhel9_rabbitmq_erlang_url }}"
230-
file: "{{ 'copr-rabbitmq-erlang.repo' if kolla_base_arch == 'aarch64' else 'rabbitmq_rabbitmq-erlang.repo' }}"
231-
tag: "{{ 'copr-rabbitmq-erlang' if kolla_base_arch == 'aarch64' else 'rabbitmq_rabbitmq-erlang' }}"
230+
file: "rabbitmq_rabbitmq-erlang.repo"
231+
tag: "rabbitmq_rabbitmq-erlang"
232+
- url: "{{ stackhpc_repo_rhel9_rabbitmq_erlang_26_url }}"
233+
file: "copr-rabbitmq-erlang-26.repo"
234+
tag: "copr-rabbitmq-erlang-26"
235+
- url: "{{ stackhpc_repo_rhel9_rabbitmq_erlang_27_url }}"
236+
file: "copr-rabbitmq-erlang-27.repo"
237+
tag: "copr-rabbitmq-erlang-27"
232238
- url: "{{ stackhpc_repo_rhel9_rabbitmq_server_url }}"
233239
file: "rabbitmq_rabbitmq-server.repo"
234240
tag: "rabbitmq_rabbitmq-server"
@@ -327,11 +333,13 @@ kolla_build_blocks:
327333
tar -czf /etc/yum.repos.d.backup/repos.tar.gz -C /etc/yum.repos.d . && \
328334
{% endif %}
329335
{% for repo in base_centos_repo_overrides_post_yum_list %}
336+
if [ -f /etc/yum.repos.d/{{ repo.file }} ]; then \
330337
sed -i -e '/\[{{ repo.tag }}\]/,/^\[/ s/^\(mirrorlist *=.*\)/#\1/g' \
331338
-e '/\[{{ repo.tag }}\]/,/^\[/ s/^[# ]*\(baseurl *=.*\)/#\1/g' \
332339
-e '/\[{{ repo.tag }}\]/,/^\[/ s/^[ \t]*\(https.*\)/#\1/g' \
333340
-e '/\[{{ repo.tag }}\]/,/^\[/ s/^[# ]*\(metalink *=.*\)/#\1/g' \
334-
-e '/\[{{ repo.tag }}\]/,/^\[/ s|^\(name.*\)|\1\nbaseurl={{ repo.url }}|' /etc/yum.repos.d/{{ repo.file }}{% if not loop.last %} &&{% endif %} \
341+
-e '/\[{{ repo.tag }}\]/,/^\[/ s|^\(name.*\)|\1\nbaseurl={{ repo.url }}|' /etc/yum.repos.d/{{ repo.file }}; \
342+
fi{% if not loop.last %} &&{% endif %} \
335343
{% endfor %}
336344
{% endif %}
337345
# With the UCA keyring installed we can now add all repos.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ 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
2424
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20250718T004955
25-
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_aarch64_version: 20250721T162732
25+
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_26_aarch64_version: 20250905T114106
26+
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_27_aarch64_version: 20250905T114106
2627
stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20250708T003546
2728
stackhpc_pulp_repo_rhel_9_influxdb_version: 20241217T002152
2829
stackhpc_pulp_repo_rhel_9_influxdb_aarch64_version: 20241217T012754

‎etc/kayobe/pulp.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,10 @@ stackhpc_pulp_repo_rocky_9_crb_version: "{{ lookup('vars', 'stackhpc_pulp_repo_r
258258
stackhpc_pulp_repo_rocky_9_highavailability_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_' ~ stackhpc_pulp_repo_rocky_9_minor_version ~ '_highavailability' ~ arch_suffix ~ '_version') }}"
259259

260260
# Rocky 9 Multiarch repositories
261-
stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rhel9_rabbitmq_erlang' ~ arch_suffix ~ '_version') }}"
261+
#NOTE(bbezak): Versioned Erlang repos (aarch64 only). Fallback to generic Erlang version if not defined.
262+
stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rhel9_rabbitmq_erlang' ~ arch_suffix ~ '_version', default=stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version) }}"
263+
stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_26_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rhel9_rabbitmq_erlang_26' ~ arch_suffix ~ '_version', default=stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_version) }}"
264+
stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_27_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rhel9_rabbitmq_erlang_27' ~ arch_suffix ~ '_version', default=stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_version) }}"
262265
stackhpc_pulp_repo_multiarch_centos_stream_9_nfv_openvswitch_version: "{{ lookup('vars', 'stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch' ~ arch_suffix ~ '_version') }}"
263266
stackhpc_pulp_repo_multiarch_centos_stream_9_openstack_caracal_version: "{{ lookup('vars', 'stackhpc_pulp_repo_centos_stream_9_openstack_caracal' ~ arch_suffix ~ '_version') }}"
264267
stackhpc_pulp_repo_multiarch_centos_stream_9_opstools_version: "{{ lookup('vars', 'stackhpc_pulp_repo_centos_stream_9_opstools' ~ arch_suffix ~ '_version') }}"

‎etc/kayobe/stackhpc.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,13 @@ stackhpc_repo_grafana_version: "{{ stackhpc_repo_distribution }}"
8383
# RabbitMQ - Erlang for RHEL 9
8484
stackhpc_repo_rhel9_rabbitmq_erlang_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/erlang/el/9/{{ kolla_base_arch }}/{{ stackhpc_repo_rhel9_rabbitmq_erlang_version }}"
8585
stackhpc_repo_rhel9_rabbitmq_erlang_version: "{{ stackhpc_repo_distribution }}"
86+
# RabbitMQ - Erlang 26 for RHEL 9 (aarch64)
87+
stackhpc_repo_rhel9_rabbitmq_erlang_26_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/erlang-26/el/9/aarch64/{{ stackhpc_repo_rhel9_rabbitmq_erlang_26_version }}"
88+
stackhpc_repo_rhel9_rabbitmq_erlang_26_version: "{{ stackhpc_repo_distribution }}"
89+
90+
# RabbitMQ - Erlang 27 for RHEL 9 (aarch64)
91+
stackhpc_repo_rhel9_rabbitmq_erlang_27_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/erlang-27/el/9/aarch64/{{ stackhpc_repo_rhel9_rabbitmq_erlang_27_version }}"
92+
stackhpc_repo_rhel9_rabbitmq_erlang_27_version: "{{ stackhpc_repo_distribution }}"
8693

8794
# RabbitMQ for RHEL 9
8895
stackhpc_repo_rhel9_rabbitmq_server_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/rabbitmq-server/el/9/noarch/{{ stackhpc_repo_rhel9_rabbitmq_server_version }}"
@@ -165,7 +172,7 @@ stackhpc_repo_elrepo_9_version: "{{ stackhpc_repo_distribution }}"
165172

166173
# Kolla source repository.
167174
stackhpc_kolla_source_url: "https://github.com/stackhpc/kolla"
168-
stackhpc_kolla_source_version: stackhpc/18.7.0.12
175+
stackhpc_kolla_source_version: stackhpc/18.7.0.13
169176

170177
# Kolla Ansible source repository.
171178
stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"

‎releasenotes/notes/erlang-aarch64-repo-change-a77c49c408413857.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
fixes:
3+
- |
4+
Switch aarch64 Erlang RPMs to versioned erlang-26 and erlang-27 COPR
5+
repositories to support RabbitMQ 3.13/4.1 and align with Kolla [1].
6+
x86_64 remains unchanged.
7+
[1] https://review.opendev.org/c/openstack/kolla/+/959692

0 commit comments

Comments
 (0)