Skip to content

Commit 8b0adbb

Browse files
authored
Merge branch 'stackhpc/2025.1' into aarch64-image-build
2 parents 5d2b917 + 25dc553 commit 8b0adbb

16 files changed

+76
-22
lines changed

.github/workflows/stackhpc-container-image-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ jobs:
155155
156156
- name: Install Trivy
157157
run: |
158-
curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sudo sh -s -- -b /usr/local/bin v0.62.1
158+
curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sudo sh -s -- -b /usr/local/bin v0.66.0
159159
160160
- name: Install yq
161161
run: |
@@ -325,7 +325,7 @@ jobs:
325325

326326
- name: Fail when images failed to push
327327
run: if [ $(wc -l < image-build-logs/push-failed-images.txt) -gt 0 ]; then cat image-build-logs/push-failed-images.txt && exit 1; fi
328-
if: ${{ !cancelled() }}
328+
if: ${{ inputs.push && !cancelled() }}
329329

330330
# NOTE(seunghun1ee): Currently we want to mark the job fail only when critical CVEs are detected.
331331
# This can be used again instead of "Fail when critical vulnerabilities are found" when it's

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
permissions:
1818
pull-requests: read
1919
name: Check changed files
20-
if: github.repository == 'stackhpc/stackhpc-kayobe-config' && !github.event.pull_request.draft
20+
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
2121
needs:
2222
- lint
2323
# - tox
@@ -49,7 +49,7 @@ jobs:
4949
- environment: docs
5050
python-version: "3.12"
5151
name: Tox ${{ matrix.environment }} with Python ${{ matrix.python-version }}
52-
if: github.repository == 'stackhpc/stackhpc-kayobe-config' && !github.event.pull_request.draft
52+
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
5353
steps:
5454
- name: GitHub Checkout 🛎
5555
uses: actions/checkout@v4
@@ -77,7 +77,7 @@ jobs:
7777
- ansible: "2.17"
7878
python: "3.10"
7979
name: Ansible ${{ matrix.ansible }} lint with Python ${{ matrix.python }}
80-
if: github.repository == 'stackhpc/stackhpc-kayobe-config' && !github.event.pull_request.draft
80+
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
8181
steps:
8282
- name: GitHub Checkout 🛎
8383
uses: actions/checkout@v4
@@ -116,7 +116,7 @@ jobs:
116116
uses: ./.github/workflows/stackhpc-build-kayobe-image.yml
117117
with:
118118
if: ${{ needs.check-changes.outputs.build-kayobe-image == 'true' }}
119-
if: github.repository == 'stackhpc/stackhpc-kayobe-config' && !github.event.pull_request.draft
119+
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
120120

121121
check-tags:
122122
name: Check container image tags
@@ -128,7 +128,7 @@ jobs:
128128
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
129129
if: ${{ needs.check-changes.outputs.check-tags == 'true' }}
130130
secrets: inherit
131-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' && !github.event.pull_request.draft }}
131+
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
132132

133133
all-in-one-ubuntu-noble-ovn:
134134
name: aio (Ubuntu Noble OVN)
@@ -145,7 +145,7 @@ jobs:
145145
OS_CLOUD: openstack
146146
if: ${{ needs.check-changes.outputs.aio == 'true' }}
147147
secrets: inherit
148-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' && !github.event.pull_request.draft }}
148+
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
149149

150150
all-in-one-rocky-9-ovs:
151151
name: aio (Rocky 9 OVS)
@@ -162,7 +162,7 @@ jobs:
162162
OS_CLOUD: openstack
163163
if: ${{ needs.check-changes.outputs.aio == 'true' }}
164164
secrets: inherit
165-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' && !github.event.pull_request.draft }}
165+
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
166166

167167
all-in-one-rocky-9-ovn:
168168
name: aio (Rocky 9 OVN)
@@ -179,7 +179,7 @@ jobs:
179179
OS_CLOUD: openstack
180180
if: ${{ needs.check-changes.outputs.aio == 'true' }}
181181
secrets: inherit
182-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' && !github.event.pull_request.draft }}
182+
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
183183

184184
# Test two upgrade scenarios: Ubuntu Jammy to Noble OVN and Rocky 9 OVN.
185185

@@ -199,7 +199,7 @@ jobs:
199199
if: ${{ needs.check-changes.outputs.aio == 'true' }}
200200
upgrade: true
201201
secrets: inherit
202-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' && !github.event.pull_request.draft }}
202+
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
203203

204204
all-in-one-upgrade-rocky-9-ovn:
205205
name: aio upgrade (Rocky 9 OVN)
@@ -217,7 +217,7 @@ jobs:
217217
if: ${{ needs.check-changes.outputs.aio == 'true' }}
218218
upgrade: true
219219
secrets: inherit
220-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' && !github.event.pull_request.draft }}
220+
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
221221

222222
all-in-one-upgrade-rocky-9-ovs:
223223
name: aio upgrade (Rocky 9 OVS)
@@ -235,4 +235,4 @@ jobs:
235235
if: ${{ needs.check-changes.outputs.aio == 'true' }}
236236
upgrade: true
237237
secrets: inherit
238-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' && !github.event.pull_request.draft }}
238+
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}

etc/kayobe/ansible/deploy-radosgw-usage-exporter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
- name: Ensure radosgw_usage_exporter container is running
108108
community.docker.docker_container:
109109
name: radosgw_usage_exporter
110-
image: ghcr.io/stackhpc/radosgw_usage_exporter:v0.1.3
110+
image: ghcr.io/stackhpc/radosgw_usage_exporter:v0.1.4
111111
network_mode: host
112112
env:
113113
RADOSGW_SERVER: "{{ radosgw_server }}"

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_noble_version: "{{ stackhpc_pulp_repo_ubuntu_noble_version }}"
2931
stackhpc_repo_ubuntu_noble_security_version: "{{ stackhpc_pulp_repo_ubuntu_noble_security_version }}"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ stackhpc_repo_mirror_password: !vault |
4949
# Build against released Pulp repository versions.
5050
stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}"
5151
stackhpc_repo_rhel9_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_version }}"
52+
stackhpc_repo_rhel9_rabbitmq_erlang_26_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_26_version }}"
53+
stackhpc_repo_rhel9_rabbitmq_erlang_27_version: "{{ stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_27_version }}"
5254
stackhpc_repo_rhel9_rabbitmq_server_version: "{{ stackhpc_pulp_repo_rhel9_rabbitmq_server_version }}"
5355
stackhpc_repo_ubuntu_noble_version: "{{ stackhpc_pulp_repo_ubuntu_noble_version }}"
5456
stackhpc_repo_ubuntu_noble_security_version: "{{ stackhpc_pulp_repo_ubuntu_noble_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_noble_version: "{{ stackhpc_pulp_repo_ubuntu_noble_version }}"
2931
stackhpc_repo_ubuntu_noble_security_version: "{{ stackhpc_pulp_repo_ubuntu_noble_security_version }}"

etc/kayobe/kolla-image-tags.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,15 @@ kolla_image_tags:
99
keystone:
1010
rocky-9: 2025.1-rocky-9-20250805T134044
1111
ubuntu-noble: 2025.1-ubuntu-noble-20250805T134044
12+
kolla_toolbox:
13+
rocky-9: 2025.1-rocky-9-20250905T151507
14+
ubuntu-noble: 2025.1-ubuntu-noble-20250905T151507
1215
magnum:
1316
rocky-9: 2025.1-rocky-9-20250811T111154
1417
ubuntu-noble: 2025.1-ubuntu-noble-20250811T111154
1518
prometheus_libvirt_exporter:
1619
rocky-9: 2025.1-rocky-9-20250822T151934
1720
ubuntu-noble: 2025.1-ubuntu-noble-20250822T151934
21+
rabbitmq:
22+
rocky-9: 2025.1-rocky-9-20250905T151507
23+
ubuntu-noble: 2025.1-ubuntu-noble-20250905T151507

etc/kayobe/kolla.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,14 @@ stackhpc_rocky_9_third_party_repos:
209209
file: "CentOS-Ceph-Squid.repo"
210210
tag: "centos-ceph-squid"
211211
- url: "{{ stackhpc_repo_rhel9_rabbitmq_erlang_url }}"
212-
file: "{{ 'copr-rabbitmq-erlang.repo' if kolla_base_arch == 'aarch64' else 'rabbitmq_rabbitmq-erlang.repo' }}"
213-
tag: "{{ 'copr-rabbitmq-erlang' if kolla_base_arch == 'aarch64' else 'rabbitmq_rabbitmq-erlang' }}"
212+
file: "rabbitmq_rabbitmq-erlang.repo"
213+
tag: "rabbitmq_rabbitmq-erlang"
214+
- url: "{{ stackhpc_repo_rhel9_rabbitmq_erlang_26_url }}"
215+
file: "copr-rabbitmq-erlang-26.repo"
216+
tag: "copr-rabbitmq-erlang-26"
217+
- url: "{{ stackhpc_repo_rhel9_rabbitmq_erlang_27_url }}"
218+
file: "copr-rabbitmq-erlang-27.repo"
219+
tag: "copr-rabbitmq-erlang-27"
214220
- url: "{{ stackhpc_repo_rhel9_rabbitmq_server_url }}"
215221
file: "rabbitmq_rabbitmq-server.repo"
216222
tag: "rabbitmq_rabbitmq-server"
@@ -293,11 +299,13 @@ kolla_build_blocks:
293299
tar -czf /etc/yum.repos.d.backup/repos.tar.gz -C /etc/yum.repos.d . && \
294300
{% endif %}
295301
{% for repo in base_centos_repo_overrides_post_yum_list %}
302+
if [ -f /etc/yum.repos.d/{{ repo.file }} ]; then \
296303
sed -i -e '/\[{{ repo.tag }}\]/,/^\[/ s/^\(mirrorlist *=.*\)/#\1/g' \
297304
-e '/\[{{ repo.tag }}\]/,/^\[/ s/^[# ]*\(baseurl *=.*\)/#\1/g' \
298305
-e '/\[{{ repo.tag }}\]/,/^\[/ s/^[ \t]*\(https.*\)/#\1/g' \
299306
-e '/\[{{ repo.tag }}\]/,/^\[/ s/^[# ]*\(metalink *=.*\)/#\1/g' \
300-
-e '/\[{{ repo.tag }}\]/,/^\[/ s|^\(name.*\)|\1\nbaseurl={{ repo.url }}|' /etc/yum.repos.d/{{ repo.file }}{% if not loop.last %} &&{% endif %} \
307+
-e '/\[{{ repo.tag }}\]/,/^\[/ s|^\(name.*\)|\1\nbaseurl={{ repo.url }}|' /etc/yum.repos.d/{{ repo.file }}; \
308+
fi{% if not loop.last %} &&{% endif %} \
301309
{% endfor %}
302310
# NOTE(bbezak): RDO epoxy repo obsoletes many OVN versions
303311
# (see rdo-openvswitch.spec obsolete_ovn_versions:

etc/kayobe/pulp-repo-versions.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ stackhpc_pulp_repo_grafana_version: 20250615T005738
2727
stackhpc_pulp_repo_opensearch_2_x_version: 20250430T014638
2828
stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20250430T014638
2929
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20250718T004955
30-
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_aarch64_version: 20250721T162732
30+
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_26_aarch64_version: 20250905T114106
31+
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_27_aarch64_version: 20250905T114106
3132
stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20250708T003546
3233
stackhpc_pulp_repo_rhel_9_influxdb_version: 20250529T023704
3334
stackhpc_pulp_repo_rhel_9_influxdb_aarch64_version: 20250529T041909

etc/kayobe/pulp.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,10 @@ stackhpc_pulp_repo_rocky_9_crb_version: "{{ lookup('vars', 'stackhpc_pulp_repo_r
216216
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') }}"
217217

218218
# Rocky 9 Multiarch repositories
219-
stackhpc_pulp_repo_multiarch_rhel9_rabbitmq_erlang_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rhel9_rabbitmq_erlang' ~ arch_suffix ~ '_version') }}"
219+
#NOTE(bbezak): Versioned Erlang repos (aarch64 only). Fallback to generic Erlang version if not defined.
220+
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) }}"
221+
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) }}"
222+
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) }}"
220223
stackhpc_pulp_repo_multiarch_centos_stream_9_nfv_openvswitch_version: "{{ lookup('vars', 'stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch' ~ arch_suffix ~ '_version') }}"
221224
stackhpc_pulp_repo_multiarch_centos_stream_9_openstack_epoxy_version: "{{ lookup('vars', 'stackhpc_pulp_repo_centos_stream_9_openstack_epoxy' ~ arch_suffix ~ '_version') }}"
222225
stackhpc_pulp_repo_multiarch_centos_stream_9_opstools_version: "{{ lookup('vars', 'stackhpc_pulp_repo_centos_stream_9_opstools' ~ arch_suffix ~ '_version') }}"

0 commit comments

Comments
 (0)