Skip to content

Commit 42c8a15

Browse files
bbezakJasleenKaurSethi
authored andcommitted
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 <[email protected]>
1 parent 6eaa217 commit 42c8a15

File tree

3 files changed

+22
-0
lines changed

3 files changed

+22
-0
lines changed

etc/kayobe/kolla-image-tags.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,14 @@ kolla_image_tags:
6161
rocky-9: 2025.1-rocky-9-20251031T094539
6262
ubuntu-noble: 2025.1-ubuntu-noble-20251031T094539
6363
kolla_toolbox:
64+
<<<<<<< HEAD
6465
rocky-9: 2025.1-rocky-9-20250905T151507
6566
ubuntu-noble: 2025.1-ubuntu-noble-20250905T151507
67+
=======
68+
rocky-9: 2024.1-rocky-9-20250908T155427
69+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250529T081147
70+
ubuntu-noble: 2024.1-ubuntu-noble-20250529T081147
71+
>>>>>>> 599ce98a (rocky/aarch64: switch to versioned Erlang 26/27 repos (#1870))
6672
magnum:
6773
rocky-9: 2025.1-rocky-9-20251016T073648
6874
ubuntu-noble: 2025.1-ubuntu-noble-20251016T073648
@@ -72,5 +78,11 @@ kolla_image_tags:
7278
rocky-9: 2025.1-rocky-9-20250822T151934
7379
ubuntu-noble: 2025.1-ubuntu-noble-20250822T151934
7480
rabbitmq:
81+
<<<<<<< HEAD
7582
rocky-9: 2025.1-rocky-9-20250905T151507
7683
ubuntu-noble: 2025.1-ubuntu-noble-20250905T151507
84+
=======
85+
rocky-9: 2024.1-rocky-9-20250908T155427
86+
ubuntu-jammy: 2024.1-ubuntu-jammy-20250722T083943
87+
ubuntu-noble: 2024.1-ubuntu-noble-20250722T083943
88+
>>>>>>> 599ce98a (rocky/aarch64: switch to versioned Erlang 26/27 repos (#1870))

etc/kayobe/stackhpc.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,13 +172,17 @@ stackhpc_repo_elrepo_9_version: "{{ stackhpc_repo_distribution }}"
172172
stackhpc_kolla_source_url: "https://github.com/stackhpc/kolla"
173173
<<<<<<< HEAD
174174
<<<<<<< HEAD
175+
<<<<<<< HEAD
175176
stackhpc_kolla_source_version: stackhpc/20.2.0.4
176177
=======
177178
stackhpc_kolla_source_version: stackhpc/18.7.0.11
178179
>>>>>>> 512f5389 (Bump kolla to stackhpc/18.7.0.11)
179180
=======
180181
stackhpc_kolla_source_version: stackhpc/18.7.0.12
181182
>>>>>>> 4877398f (Bump kolla to stackhpc/18.7.0.12)
183+
=======
184+
stackhpc_kolla_source_version: stackhpc/18.7.0.13
185+
>>>>>>> 599ce98a (rocky/aarch64: switch to versioned Erlang 26/27 repos (#1870))
182186

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

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
fixes:
33
- |
44
Switch aarch64 Erlang RPMs to versioned erlang-26 and erlang-27 COPR
5+
<<<<<<< HEAD
56
repositories to support RabbitMQ 4.0/4.1 and align with Kolla [1].
67
x86_64 remains unchanged.
78
[1] https://review.opendev.org/c/openstack/kolla/+/959323
9+
=======
10+
repositories to support RabbitMQ 3.13/4.1 and align with Kolla [1].
11+
x86_64 remains unchanged.
12+
[1] https://review.opendev.org/c/openstack/kolla/+/959692
13+
>>>>>>> 599ce98a (rocky/aarch64: switch to versioned Erlang 26/27 repos (#1870))

0 commit comments

Comments
 (0)