Merge branch 'stackhpc/2025.1' into periodic-host-image-build

Author: MaxBed4d

.github/workflows/stackhpc-pull-request.yml

@@ -17,7 +17,7 @@ jobs:
     permissions:
       pull-requests: read
     name: Check changed files
-    if: github.repository == 'stackhpc/stackhpc-kayobe-config' && !github.event.pull_request.draft
+    if: github.repository == 'stackhpc/stackhpc-kayobe-config'
     needs:
       - lint
       # - tox
@@ -49,7 +49,7 @@ jobs:
           - environment: docs
             python-version: "3.12"
     name: Tox ${{ matrix.environment }} with Python ${{ matrix.python-version }}
-    if: github.repository == 'stackhpc/stackhpc-kayobe-config' && !github.event.pull_request.draft
+    if: github.repository == 'stackhpc/stackhpc-kayobe-config'
     steps:
       - name: GitHub Checkout 🛎
         uses: actions/checkout@v4
@@ -77,7 +77,7 @@ jobs:
           - ansible: "2.17"
             python: "3.10"
     name: Ansible ${{ matrix.ansible }} lint with Python ${{ matrix.python }}
-    if: github.repository == 'stackhpc/stackhpc-kayobe-config' && !github.event.pull_request.draft
+    if: github.repository == 'stackhpc/stackhpc-kayobe-config'
     steps:
       - name: GitHub Checkout 🛎
         uses: actions/checkout@v4
@@ -116,7 +116,7 @@ jobs:
     uses: ./.github/workflows/stackhpc-build-kayobe-image.yml
     with:
       if: ${{ needs.check-changes.outputs.build-kayobe-image == 'true' }}
-    if: github.repository == 'stackhpc/stackhpc-kayobe-config' && !github.event.pull_request.draft
+    if: github.repository == 'stackhpc/stackhpc-kayobe-config'
 
   check-tags:
     name: Check container image tags
@@ -128,7 +128,7 @@ jobs:
       kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
       if: ${{ needs.check-changes.outputs.check-tags == 'true' }}
     secrets: inherit
-    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' && !github.event.pull_request.draft }}
+    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
 
   all-in-one-ubuntu-noble-ovn:
     name: aio (Ubuntu Noble OVN)
@@ -145,7 +145,7 @@ jobs:
       OS_CLOUD: openstack
       if: ${{ needs.check-changes.outputs.aio == 'true' }}
     secrets: inherit
-    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' && !github.event.pull_request.draft }}
+    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
 
   all-in-one-rocky-9-ovs:
     name: aio (Rocky 9 OVS)
@@ -162,7 +162,7 @@ jobs:
       OS_CLOUD: openstack
       if: ${{ needs.check-changes.outputs.aio == 'true' }}
     secrets: inherit
-    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' && !github.event.pull_request.draft }}
+    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
 
   all-in-one-rocky-9-ovn:
     name: aio (Rocky 9 OVN)
@@ -179,7 +179,7 @@ jobs:
       OS_CLOUD: openstack
       if: ${{ needs.check-changes.outputs.aio == 'true' }}
     secrets: inherit
-    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' && !github.event.pull_request.draft }}
+    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
 
   # Test two upgrade scenarios: Ubuntu Jammy to Noble OVN and Rocky 9 OVN.
 
@@ -199,7 +199,7 @@ jobs:
       if: ${{ needs.check-changes.outputs.aio == 'true' }}
       upgrade: true
     secrets: inherit
-    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' && !github.event.pull_request.draft }}
+    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
 
   all-in-one-upgrade-rocky-9-ovn:
     name: aio upgrade (Rocky 9 OVN)
@@ -217,7 +217,7 @@ jobs:
       if: ${{ needs.check-changes.outputs.aio == 'true' }}
       upgrade: true
     secrets: inherit
-    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' && !github.event.pull_request.draft }}
+    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
 
   all-in-one-upgrade-rocky-9-ovs:
     name: aio upgrade (Rocky 9 OVS)
@@ -235,4 +235,4 @@ jobs:
       if: ${{ needs.check-changes.outputs.aio == 'true' }}
       upgrade: true
     secrets: inherit
-    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' && !github.event.pull_request.draft }}
+    if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}

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

@@ -24,6 +24,8 @@ stackhpc_repo_mirror_password: !vault |
 # Build against released Pulp repository versions.
 stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}"
 stackhpc_repo_rhel9_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_version }}"
+stackhpc_repo_rhel9_rabbitmq_erlang_26_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_26_version }}"
+stackhpc_repo_rhel9_rabbitmq_erlang_27_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_27_version }}"
 stackhpc_repo_rhel9_rabbitmq_server_version: "{{ stackhpc_pulp_repo_rhel9_rabbitmq_server_version }}"
 stackhpc_repo_ubuntu_noble_version: "{{ stackhpc_pulp_repo_ubuntu_noble_version }}"
 stackhpc_repo_ubuntu_noble_security_version: "{{ stackhpc_pulp_repo_ubuntu_noble_security_version }}"

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

@@ -49,6 +49,8 @@ stackhpc_repo_mirror_password: !vault |
 # Build against released Pulp repository versions.
 stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}"
 stackhpc_repo_rhel9_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_version }}"
+stackhpc_repo_rhel9_rabbitmq_erlang_26_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_26_version }}"
+stackhpc_repo_rhel9_rabbitmq_erlang_27_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_27_version }}"
 stackhpc_repo_rhel9_rabbitmq_server_version: "{{ stackhpc_pulp_repo_rhel9_rabbitmq_server_version }}"
 stackhpc_repo_ubuntu_noble_version: "{{ stackhpc_pulp_repo_ubuntu_noble_version }}"
 stackhpc_repo_ubuntu_noble_security_version: "{{ stackhpc_pulp_repo_ubuntu_noble_security_version }}"

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

@@ -24,6 +24,8 @@ stackhpc_repo_mirror_password: !vault |
 # Build and deploy released Pulp repository versions.
 stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}"
 stackhpc_repo_rhel9_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_version }}"
+stackhpc_repo_rhel9_rabbitmq_erlang_26_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_26_version }}"
+stackhpc_repo_rhel9_rabbitmq_erlang_27_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_27_version }}"
 stackhpc_repo_rhel9_rabbitmq_server_version: "{{ stackhpc_pulp_repo_rhel9_rabbitmq_server_version }}"
 stackhpc_repo_ubuntu_noble_version: "{{ stackhpc_pulp_repo_ubuntu_noble_version }}"
 stackhpc_repo_ubuntu_noble_security_version: "{{ stackhpc_pulp_repo_ubuntu_noble_security_version }}"

etc/kayobe/kolla-image-tags.yml

@@ -9,9 +9,15 @@ kolla_image_tags:
   keystone:
     rocky-9: 2025.1-rocky-9-20250805T134044
     ubuntu-noble: 2025.1-ubuntu-noble-20250805T134044
+  kolla_toolbox:
+    rocky-9: 2025.1-rocky-9-20250905T151507
+    ubuntu-noble: 2025.1-ubuntu-noble-20250905T151507
   magnum:
     rocky-9: 2025.1-rocky-9-20250811T111154
     ubuntu-noble: 2025.1-ubuntu-noble-20250811T111154
   prometheus_libvirt_exporter:
     rocky-9: 2025.1-rocky-9-20250822T151934
     ubuntu-noble: 2025.1-ubuntu-noble-20250822T151934
+  rabbitmq:
+    rocky-9: 2025.1-rocky-9-20250905T151507
+    ubuntu-noble: 2025.1-ubuntu-noble-20250905T151507

etc/kayobe/kolla.yml

@@ -198,8 +198,14 @@ stackhpc_rocky_9_third_party_repos:
     file: "CentOS-Ceph-Squid.repo"
     tag: "centos-ceph-squid"
   - url: "{{ stackhpc_repo_rhel9_rabbitmq_erlang_url }}"
-    file: "{{ 'copr-rabbitmq-erlang.repo' if kolla_base_arch == 'aarch64' else 'rabbitmq_rabbitmq-erlang.repo' }}"
-    tag: "{{ 'copr-rabbitmq-erlang' if kolla_base_arch == 'aarch64' else 'rabbitmq_rabbitmq-erlang' }}"
+    file: "rabbitmq_rabbitmq-erlang.repo"
+    tag: "rabbitmq_rabbitmq-erlang"
+  - url: "{{ stackhpc_repo_rhel9_rabbitmq_erlang_26_url }}"
+    file: "copr-rabbitmq-erlang-26.repo"
+    tag: "copr-rabbitmq-erlang-26"
+  - url: "{{ stackhpc_repo_rhel9_rabbitmq_erlang_27_url }}"
+    file: "copr-rabbitmq-erlang-27.repo"
+    tag: "copr-rabbitmq-erlang-27"
   - url: "{{ stackhpc_repo_rhel9_rabbitmq_server_url }}"
     file: "rabbitmq_rabbitmq-server.repo"
     tag: "rabbitmq_rabbitmq-server"
@@ -282,11 +288,13 @@ kolla_build_blocks:
         tar -czf /etc/yum.repos.d.backup/repos.tar.gz -C /etc/yum.repos.d . && \
     {% endif %}
     {% for repo in base_centos_repo_overrides_post_yum_list %}
+    if [ -f /etc/yum.repos.d/{{ repo.file }} ]; then \
         sed -i -e '/\[{{ repo.tag }}\]/,/^\[/ s/^\(mirrorlist *=.*\)/#\1/g' \
                -e '/\[{{ repo.tag }}\]/,/^\[/ s/^[# ]*\(baseurl *=.*\)/#\1/g' \
                -e '/\[{{ repo.tag }}\]/,/^\[/ s/^[ \t]*\(https.*\)/#\1/g' \
                -e '/\[{{ repo.tag }}\]/,/^\[/ s/^[# ]*\(metalink *=.*\)/#\1/g' \
-               -e '/\[{{ repo.tag }}\]/,/^\[/ s|^\(name.*\)|\1\nbaseurl={{ repo.url }}|' /etc/yum.repos.d/{{ repo.file }}{% if not loop.last %} &&{% endif %} \
+               -e '/\[{{ repo.tag }}\]/,/^\[/ s|^\(name.*\)|\1\nbaseurl={{ repo.url }}|' /etc/yum.repos.d/{{ repo.file }}; \
+    fi{% if not loop.last %} &&{% endif %} \
     {% endfor %}
         # NOTE(bbezak): RDO epoxy repo obsoletes many OVN versions
         # (see rdo-openvswitch.spec obsolete_ovn_versions:

etc/kayobe/pulp-repo-versions.yml

@@ -27,7 +27,8 @@ stackhpc_pulp_repo_grafana_version: 20250615T005738
 stackhpc_pulp_repo_opensearch_2_x_version: 20250430T014638
 stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20250430T014638
 stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20250718T004955
-stackhpc_pulp_repo_rhel9_rabbitmq_erlang_aarch64_version: 20250721T162732
+stackhpc_pulp_repo_rhel9_rabbitmq_erlang_26_aarch64_version: 20250905T114106
+stackhpc_pulp_repo_rhel9_rabbitmq_erlang_27_aarch64_version: 20250905T114106
 stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20250708T003546
 stackhpc_pulp_repo_rhel_9_influxdb_version: 20250529T023704
 stackhpc_pulp_repo_rhel_9_influxdb_aarch64_version: 20250529T041909

etc/kayobe/pulp.yml

@@ -216,7 +216,10 @@ stackhpc_pulp_repo_rocky_9_crb_version: "{{ lookup('vars', 'stackhpc_pulp_repo_r
 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') }}"
 
 # Rocky 9 Multiarch repositories
-stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rhel9_rabbitmq_erlang' ~ arch_suffix ~ '_version') }}"
+#NOTE(bbezak): Versioned Erlang repos (aarch64 only). Fallback to generic Erlang version if not defined.
+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) }}"
+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) }}"
+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) }}"
 stackhpc_pulp_repo_multiarch_centos_stream_9_nfv_openvswitch_version: "{{ lookup('vars', 'stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch' ~ arch_suffix ~ '_version') }}"
 stackhpc_pulp_repo_multiarch_centos_stream_9_openstack_epoxy_version: "{{ lookup('vars', 'stackhpc_pulp_repo_centos_stream_9_openstack_epoxy' ~ arch_suffix ~ '_version') }}"
 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

@@ -67,6 +67,13 @@ stackhpc_repo_grafana_version: "{{ stackhpc_repo_distribution }}"
 # RabbitMQ - Erlang for RHEL 9
 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 }}"
 stackhpc_repo_rhel9_rabbitmq_erlang_version: "{{ stackhpc_repo_distribution }}"
+# RabbitMQ - Erlang 26 for RHEL 9 (aarch64)
+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 }}"
+stackhpc_repo_rhel9_rabbitmq_erlang_26_version: "{{ stackhpc_repo_distribution }}"
+
+# RabbitMQ - Erlang 27 for RHEL 9 (aarch64)
+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 }}"
+stackhpc_repo_rhel9_rabbitmq_erlang_27_version: "{{ stackhpc_repo_distribution }}"
 
 # RabbitMQ for RHEL 9
 stackhpc_repo_rhel9_rabbitmq_server_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/rabbitmq-server/el/9/noarch/{{ stackhpc_repo_rhel9_rabbitmq_server_version }}"
@@ -153,7 +160,7 @@ stackhpc_repo_elrepo_9_version: "{{ stackhpc_repo_distribution }}"
 
 # Kolla source repository.
 stackhpc_kolla_source_url: "https://github.com/stackhpc/kolla"
-stackhpc_kolla_source_version: stackhpc/20.1.0.10
+stackhpc_kolla_source_version: stackhpc/20.1.0.11
 
 # Kolla Ansible source repository.
 stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"

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

@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Switch aarch64 Erlang RPMs to versioned erlang-26 and erlang-27 COPR
+    repositories to support RabbitMQ 4.0/4.1 and align with Kolla [1].
+    x86_64 remains unchanged.
+    [1] https://review.opendev.org/c/openstack/kolla/+/959323