Skip to content

Commit 35c48ad

Browse files
bbezakbbezak
committed
add cross-arch aarch64 container image builds
1 parent 8f9e962 commit 35c48ad

File tree

4 files changed

+132
-86
lines changed

4 files changed

+132
-86
lines changed

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

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ on:
1313
type: boolean
1414
required: false
1515
default: true
16+
overcloud-r9-aarch64:
17+
description: Build overcloud Rocky Linux 9 AARCH64 images?
18+
type: boolean
19+
required: false
20+
default: false
1621
seed:
1722
description: Build seed images?
1823
type: boolean
@@ -180,7 +185,7 @@ jobs:
180185
run: |
181186
args="${{ inputs.regexes }}"
182187
args="$args -e kolla_base_distro=${{ matrix.distro }}"
183-
args="$args -e kolla_tag=${{ steps.write-kolla-tag.outputs.kolla-tag }}"
188+
args="$args -e kolla_tag=${{ steps.write-kolla-tag.outputs.kolla-tag }}-amd64"
184189
args="$args -e stackhpc_repo_mirror_auth_proxy_enabled=true"
185190
source venvs/kayobe/bin/activate &&
186191
source src/kayobe-config/kayobe-env --environment ci-builder &&
@@ -189,6 +194,22 @@ jobs:
189194
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
190195
if: inputs.overcloud
191196

197+
- name: Build kolla overcloud images Rocky 9 AARCH64
198+
id: build_overcloud_images_r9_aarch64
199+
continue-on-error: true
200+
run: |
201+
args="${{ inputs.regexes }}"
202+
args="$args -e kolla_base_distro=rocky"
203+
args="$args -e kolla_base_arch=aarch64"
204+
args="$args -e kolla_tag=${{ steps.write-kolla-tag.outputs.kolla-tag }}-aarch64"
205+
args="$args -e stackhpc_repo_mirror_auth_proxy_enabled=true"
206+
source venvs/kayobe/bin/activate &&
207+
source src/kayobe-config/kayobe-env --environment ci-builder &&
208+
kayobe overcloud container image build $args
209+
env:
210+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
211+
if: inputs.overcloud-r9-aarch64
212+
192213
- name: Copy overcloud container image build logs to output directory
193214
run: sudo mv /var/log/kolla-build.log image-build-logs/kolla-build-overcloud.log
194215
if: inputs.overcloud

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

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -46,34 +46,34 @@ stackhpc_repo_mirror_password: !vault |
4646
3837336661653962340a316631366463623138623530373133336665376433633437306631383666
4747
30333461333535363433363336663664316634343432633766346564323833346663
4848
49-
# Build against released Pulp repository versions.
50-
stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}"
51-
stackhpc_repo_rhel9_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version }}"
52-
stackhpc_repo_rhel9_rabbitmq_server_version: "{{ stackhpc_pulp_repo_rhel9_rabbitmq_server_version }}"
53-
stackhpc_repo_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_ubuntu_jammy_version }}"
54-
stackhpc_repo_ubuntu_jammy_security_version: "{{ stackhpc_pulp_repo_ubuntu_jammy_security_version }}"
49+
# Build against released Pulp repository versions based on architecture
50+
stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_versions[kolla_base_arch].stackhpc_pulp_repo_grafana_version }}"
51+
stackhpc_repo_rhel9_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_versions[kolla_base_arch].stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version }}"
52+
stackhpc_repo_rhel9_rabbitmq_server_version: "{{ stackhpc_pulp_repo_versions[kolla_base_arch].stackhpc_pulp_repo_rhel9_rabbitmq_server_version }}"
5553
stackhpc_repo_ubuntu_jammy_cve_2024_6387_version: ""
56-
stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
57-
stackhpc_repo_docker_ce_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_jammy_version }}"
58-
stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
59-
stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version }}"
60-
stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
61-
stackhpc_repo_centos_stream_9_storage_ceph_reef_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version }}"
62-
stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"
63-
stackhpc_repo_rhel_9_treasuredata_5_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_5_version }}"
64-
stackhpc_repo_rhel_9_mariadb_10_11_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_11_version }}"
65-
stackhpc_repo_rhel_9_influxdb_version: "{{ stackhpc_pulp_repo_rhel_9_influxdb_version }}"
66-
stackhpc_repo_epel_9_version: "{{ stackhpc_pulp_repo_epel_9_version }}"
67-
stackhpc_repo_opensearch_2_x_version: "{{ stackhpc_pulp_repo_opensearch_2_x_version }}"
68-
stackhpc_repo_opensearch_dashboards_2_x_version: "{{ stackhpc_pulp_repo_opensearch_dashboards_2_x_version }}"
69-
## Use derived vars from etc/kayobe/pulp.yml to switch between
70-
## minor Rocky versions using stackhpc_pulp_repo_rocky_x_minor_version
71-
stackhpc_repo_rocky_9_baseos_version: "{{ stackhpc_pulp_repo_rocky_9_baseos_version }}"
72-
stackhpc_repo_rocky_9_appstream_version: "{{ stackhpc_pulp_repo_rocky_9_appstream_version }}"
73-
stackhpc_repo_rocky_9_extras_version: "{{ stackhpc_pulp_repo_rocky_9_extras_version }}"
74-
stackhpc_repo_rocky_9_crb_version: "{{ stackhpc_pulp_repo_rocky_9_crb_version }}"
75-
stackhpc_repo_rocky_9_highavailability_version: "{{ stackhpc_pulp_repo_rocky_9_highavailability_version }}"
76-
stackhpc_repo_rocky_9_sig_security_common_version: "{{ stackhpc_pulp_repo_rocky_9_sig_security_common_version }}"
54+
stackhpc_repo_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_versions[kolla_base_arch].stackhpc_pulp_repo_ubuntu_jammy_version | default('') }}"
55+
stackhpc_repo_ubuntu_jammy_security_version: "{{ stackhpc_pulp_repo_versions[kolla_base_arch].stackhpc_pulp_repo_ubuntu_jammy_security_version | default('') }}"
56+
stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_versions[kolla_base_arch].stackhpc_pulp_repo_ubuntu_cloud_archive_version | default('') }}"
57+
stackhpc_repo_docker_ce_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_versions[kolla_base_arch].stackhpc_pulp_repo_docker_ce_ubuntu_jammy_version | default('') }}"
58+
stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_versions[kolla_base_arch].stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
59+
stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_pulp_repo_versions[kolla_base_arch].stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version }}"
60+
stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_versions[kolla_base_arch].stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
61+
stackhpc_repo_centos_stream_9_storage_ceph_reef_version: "{{ stackhpc_pulp_repo_versions[kolla_base_arch].stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version }}"
62+
stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_versions[kolla_base_arch].stackhpc_pulp_repo_centos_stream_9_docker_version }}"
63+
stackhpc_repo_rhel_9_treasuredata_5_version: "{{ stackhpc_pulp_repo_versions[kolla_base_arch].stackhpc_pulp_repo_rhel_9_treasuredata_5_version }}"
64+
stackhpc_repo_rhel_9_mariadb_10_11_version: "{{ stackhpc_pulp_repo_versions[kolla_base_arch].stackhpc_pulp_repo_rhel_9_mariadb_10_11_version }}"
65+
stackhpc_repo_rhel_9_influxdb_version: "{{ stackhpc_pulp_repo_versions[kolla_base_arch].stackhpc_pulp_repo_rhel_9_influxdb_version }}"
66+
stackhpc_repo_epel_9_version: "{{ stackhpc_pulp_repo_versions[kolla_base_arch].stackhpc_pulp_repo_epel_9_version }}"
67+
stackhpc_repo_opensearch_2_x_version: "{{ stackhpc_pulp_repo_versions[kolla_base_arch].stackhpc_pulp_repo_opensearch_2_x_version }}"
68+
stackhpc_repo_opensearch_dashboards_2_x_version: "{{ stackhpc_pulp_repo_versions[kolla_base_arch].stackhpc_pulp_repo_opensearch_dashboards_2_x_version }}"
69+
70+
# Dynamically set the Rocky Linux-specific versions for each minor release
71+
stackhpc_repo_rocky_9_baseos_version: "{{ stackhpc_pulp_repo_versions[kolla_base_arch]['stackhpc_pulp_repo_rocky_9_' ~ stackhpc_pulp_repo_rocky_9_minor_version ~ '_baseos_version'] }}"
72+
stackhpc_repo_rocky_9_appstream_version: "{{ stackhpc_pulp_repo_versions[kolla_base_arch]['stackhpc_pulp_repo_rocky_9_' ~ stackhpc_pulp_repo_rocky_9_minor_version ~ '_appstream_version'] }}"
73+
stackhpc_repo_rocky_9_extras_version: "{{ stackhpc_pulp_repo_versions[kolla_base_arch]['stackhpc_pulp_repo_rocky_9_' ~ stackhpc_pulp_repo_rocky_9_minor_version ~ '_extras_version'] }}"
74+
stackhpc_repo_rocky_9_crb_version: "{{ stackhpc_pulp_repo_versions[kolla_base_arch]['stackhpc_pulp_repo_rocky_9_' ~ stackhpc_pulp_repo_rocky_9_minor_version ~ '_crb_version'] }}"
75+
stackhpc_repo_rocky_9_highavailability_version: "{{ stackhpc_pulp_repo_versions[kolla_base_arch]['stackhpc_pulp_repo_rocky_9_' ~ stackhpc_pulp_repo_rocky_9_minor_version ~ '_highavailability_version'] }}"
76+
stackhpc_repo_rocky_9_sig_security_common_version: "{{ stackhpc_pulp_repo_versions[kolla_base_arch]['stackhpc_pulp_repo_rocky_9_sig_security_common_version'] }}"
7777

7878
# Rocky-and-CI-specific Pulp urls
7979
stackhpc_include_os_minor_version_in_repo_url: true

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

Lines changed: 67 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,69 @@
11
---
22
# Do not edit! This file is autogenerated by Ansible.
3-
stackhpc_pulp_repo_centos_stream_9_docker_version: 20240829T093746
4-
stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20240829T093746
5-
stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version: 20240902T080424
6-
stackhpc_pulp_repo_centos_stream_9_opstools_version: 20231213T031318
7-
stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version: 20240502T000614
8-
stackhpc_pulp_repo_docker_ce_ubuntu_jammy_version: 20240910T001721
9-
stackhpc_pulp_repo_elrepo_9_version: 20240902T122220
10-
stackhpc_pulp_repo_epel_9_version: 20240902T080424
11-
stackhpc_pulp_repo_grafana_version: 20240902T080424
12-
stackhpc_pulp_repo_opensearch_2_x_version: 20240807T235120
13-
stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20240807T235120
14-
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20240925T093206
15-
stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20240925T111913
16-
stackhpc_pulp_repo_rhel_9_influxdb_version: 20240817T001913
17-
stackhpc_pulp_repo_rhel_9_mariadb_10_11_version: 20240810T001640
18-
stackhpc_pulp_repo_rhel_9_rabbitmq_erlang_version: 20240711T091318
19-
stackhpc_pulp_repo_rhel_9_rabbitmq_server_version: 20240711T091318
20-
stackhpc_pulp_repo_rhel_9_treasuredata_5_version: 20240711T091318
21-
stackhpc_pulp_repo_rocky_9_1_appstream_version: 20231207T013715
22-
stackhpc_pulp_repo_rocky_9_1_baseos_version: 20231206T014015
23-
stackhpc_pulp_repo_rocky_9_1_crb_version: 20231211T120328
24-
stackhpc_pulp_repo_rocky_9_1_extras_version: 20231211T120328
25-
stackhpc_pulp_repo_rocky_9_1_highavailability_version: 20231208T011702
26-
stackhpc_pulp_repo_rocky_9_2_appstream_version: 20231211T120328
27-
stackhpc_pulp_repo_rocky_9_2_baseos_version: 20231211T120328
28-
stackhpc_pulp_repo_rocky_9_2_crb_version: 20231207T013715
29-
stackhpc_pulp_repo_rocky_9_2_extras_version: 20231207T013715
30-
stackhpc_pulp_repo_rocky_9_2_highavailability_version: 20231208T011702
31-
stackhpc_pulp_repo_rocky_9_3_appstream_version: 20240508T001430
32-
stackhpc_pulp_repo_rocky_9_3_baseos_version: 20240509T005935
33-
stackhpc_pulp_repo_rocky_9_3_crb_version: 20240429T003818
34-
stackhpc_pulp_repo_rocky_9_3_extras_version: 20240506T000343
35-
stackhpc_pulp_repo_rocky_9_3_highavailability_version: 20240510T001129
36-
stackhpc_pulp_repo_rocky_9_4_appstream_version: 20240816T002610
37-
stackhpc_pulp_repo_rocky_9_4_baseos_version: 20240816T002610
38-
stackhpc_pulp_repo_rocky_9_4_crb_version: 20240816T002610
39-
stackhpc_pulp_repo_rocky_9_4_extras_version: 20240816T002610
40-
stackhpc_pulp_repo_rocky_9_4_highavailability_version: 20240816T002610
41-
stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20240718T001130
42-
stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20240911T041957
43-
stackhpc_pulp_repo_ubuntu_jammy_security_version: 20240911T063424
44-
stackhpc_pulp_repo_ubuntu_jammy_version: 20240911T063424
3+
# Architecture-specific versions for x86_64 and aarch64
4+
stackhpc_pulp_repo_versions:
5+
x86_64:
6+
stackhpc_pulp_repo_centos_stream_9_docker_version: 20240829T093746
7+
stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20240829T093746
8+
stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version: 20240902T080424
9+
stackhpc_pulp_repo_centos_stream_9_opstools_version: 20231213T031318
10+
stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version: 20240502T000614
11+
stackhpc_pulp_repo_docker_ce_ubuntu_jammy_version: 20240910T001721
12+
stackhpc_pulp_repo_elrepo_9_version: 20240902T122220
13+
stackhpc_pulp_repo_epel_9_version: 20240902T080424
14+
stackhpc_pulp_repo_grafana_version: 20240902T080424
15+
stackhpc_pulp_repo_opensearch_2_x_version: 20240807T235120
16+
stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20240807T235120
17+
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20240925T093206
18+
stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20240925T111913
19+
stackhpc_pulp_repo_rhel_9_influxdb_version: 20240817T001913
20+
stackhpc_pulp_repo_rhel_9_mariadb_10_11_version: 20240810T001640
21+
stackhpc_pulp_repo_rhel_9_rabbitmq_erlang_version: 20240711T091318
22+
stackhpc_pulp_repo_rhel_9_rabbitmq_server_version: 20240711T091318
23+
stackhpc_pulp_repo_rhel_9_treasuredata_5_version: 20240711T091318
24+
stackhpc_pulp_repo_rocky_9_1_appstream_version: 20231207T013715
25+
stackhpc_pulp_repo_rocky_9_1_baseos_version: 20231206T014015
26+
stackhpc_pulp_repo_rocky_9_1_crb_version: 20231211T120328
27+
stackhpc_pulp_repo_rocky_9_1_extras_version: 20231211T120328
28+
stackhpc_pulp_repo_rocky_9_1_highavailability_version: 20231208T011702
29+
stackhpc_pulp_repo_rocky_9_2_appstream_version: 20231211T120328
30+
stackhpc_pulp_repo_rocky_9_2_baseos_version: 20231211T120328
31+
stackhpc_pulp_repo_rocky_9_2_crb_version: 20231207T013715
32+
stackhpc_pulp_repo_rocky_9_2_extras_version: 20231207T013715
33+
stackhpc_pulp_repo_rocky_9_2_highavailability_version: 20231208T011702
34+
stackhpc_pulp_repo_rocky_9_3_appstream_version: 20240508T001430
35+
stackhpc_pulp_repo_rocky_9_3_baseos_version: 20240509T005935
36+
stackhpc_pulp_repo_rocky_9_3_crb_version: 20240429T003818
37+
stackhpc_pulp_repo_rocky_9_3_extras_version: 20240506T000343
38+
stackhpc_pulp_repo_rocky_9_3_highavailability_version: 20240510T001129
39+
stackhpc_pulp_repo_rocky_9_4_appstream_version: 20240816T002610
40+
stackhpc_pulp_repo_rocky_9_4_baseos_version: 20240816T002610
41+
stackhpc_pulp_repo_rocky_9_4_crb_version: 20240816T002610
42+
stackhpc_pulp_repo_rocky_9_4_extras_version: 20240816T002610
43+
stackhpc_pulp_repo_rocky_9_4_highavailability_version: 20240816T002610
44+
stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20240718T001130
45+
stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20240911T041957
46+
stackhpc_pulp_repo_ubuntu_jammy_security_version: 20240911T063424
47+
stackhpc_pulp_repo_ubuntu_jammy_version: 20240911T063424
48+
aarch64:
49+
stackhpc_pulp_repo_centos_stream_9_docker_version: 20241001T011548
50+
stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20241001T011548
51+
stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version: 20241001T011548
52+
stackhpc_pulp_repo_centos_stream_9_opstools_version: 20241001T011548
53+
stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version: 20241001T011548
54+
stackhpc_pulp_repo_elrepo_9_version: 20241001T011548
55+
stackhpc_pulp_repo_epel_9_version: 20241001T011548
56+
stackhpc_pulp_repo_grafana_version: 20240902T080424
57+
stackhpc_pulp_repo_opensearch_2_x_version: 20240807T235120
58+
stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20240807T235120
59+
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20241001T011548
60+
stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20240925T111913
61+
stackhpc_pulp_repo_rhel_9_influxdb_version: 20241001T011548
62+
stackhpc_pulp_repo_rhel_9_mariadb_10_11_version: 20241001T011548
63+
stackhpc_pulp_repo_rhel_9_treasuredata_5_version: 20241001T011548
64+
stackhpc_pulp_repo_rocky_9_4_appstream_version: 20241001T011548
65+
stackhpc_pulp_repo_rocky_9_4_baseos_version: 20241001T011548
66+
stackhpc_pulp_repo_rocky_9_4_crb_version: 20241001T011548
67+
stackhpc_pulp_repo_rocky_9_4_extras_version: 20241001T011548
68+
stackhpc_pulp_repo_rocky_9_4_highavailability_version: 20241001T011548
69+
stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20241001T011548

0 commit comments

Comments
 (0)