add cross-arch aarch64 container image builds

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

@@ -13,6 +13,11 @@ on:
         type: boolean
         required: false
         default: true
+      overcloud-r9-aarch64:
+        description: Build overcloud Rocky Linux 9 AARCH64 images?
+        type: boolean
+        required: false
+        default: false
       seed:
         description: Build seed images?
         type: boolean
@@ -180,7 +185,7 @@ jobs:
         run: |
           args="${{ inputs.regexes }}"
           args="$args -e kolla_base_distro=${{ matrix.distro }}"
-          args="$args -e kolla_tag=${{ steps.write-kolla-tag.outputs.kolla-tag }}"
+          args="$args -e kolla_tag=${{ steps.write-kolla-tag.outputs.kolla-tag }}-amd64"
           args="$args -e stackhpc_repo_mirror_auth_proxy_enabled=true"
           source venvs/kayobe/bin/activate &&
           source src/kayobe-config/kayobe-env --environment ci-builder &&
@@ -189,6 +194,22 @@ jobs:
           KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
         if: inputs.overcloud
 
+      - name: Build kolla overcloud images Rocky 9 AARCH64
+        id: build_overcloud_images_r9_aarch64
+        continue-on-error: true
+        run: |
+          args="${{ inputs.regexes }}"
+          args="$args -e kolla_base_distro=rocky"
+          args="$args -e kolla_base_arch=aarch64"
+          args="$args -e kolla_tag=${{ steps.write-kolla-tag.outputs.kolla-tag }}-aarch64"
+          args="$args -e stackhpc_repo_mirror_auth_proxy_enabled=true"
+          source venvs/kayobe/bin/activate &&
+          source src/kayobe-config/kayobe-env --environment ci-builder &&
+          kayobe overcloud container image build $args
+        env:
+          KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
+        if: inputs.overcloud-r9-aarch64
+
       - name: Copy overcloud container image build logs to output directory
         run: sudo mv /var/log/kolla-build.log image-build-logs/kolla-build-overcloud.log
         if: inputs.overcloud

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

@@ -46,34 +46,34 @@ stackhpc_repo_mirror_password: !vault |
   3837336661653962340a316631366463623138623530373133336665376433633437306631383666
   30333461333535363433363336663664316634343432633766346564323833346663
 
-# Build against released Pulp repository versions.
 stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}"
-stackhpc_repo_rhel9_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version }}"
-stackhpc_repo_rhel9_rabbitmq_server_version: "{{ stackhpc_pulp_repo_rhel9_rabbitmq_server_version }}"
+stackhpc_repo_rhel9_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_rhel9_rabbitmq_erlang_aarch64_version if kolla_base_arch == 'aarch64' else stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version }}"
+stackhpc_repo_rhel9_rabbitmq_server_version: "{{ stackhpc_pulp_repo_rhel9_rabbitmq_server_aarch64_version if kolla_base_arch == 'aarch64' else stackhpc_pulp_repo_rhel9_rabbitmq_server_version }}"
 stackhpc_repo_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_ubuntu_jammy_version }}"
 stackhpc_repo_ubuntu_jammy_security_version: "{{ stackhpc_pulp_repo_ubuntu_jammy_security_version }}"
 stackhpc_repo_ubuntu_jammy_cve_2024_6387_version: ""
 stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
 stackhpc_repo_docker_ce_ubuntu_jammy_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_jammy_version }}"
-stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
-stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version }}"
-stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
-stackhpc_repo_centos_stream_9_storage_ceph_reef_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version }}"
-stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"
-stackhpc_repo_rhel_9_treasuredata_5_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_5_version }}"
-stackhpc_repo_rhel_9_mariadb_10_11_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_11_version }}"
-stackhpc_repo_rhel_9_influxdb_version: "{{ stackhpc_pulp_repo_rhel_9_influxdb_version }}"
-stackhpc_repo_epel_9_version: "{{ stackhpc_pulp_repo_epel_9_version }}"
+stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_aarch64_version if kolla_base_arch == 'aarch64' else stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
+stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_caracal_aarch64_version if kolla_base_arch == 'aarch64' else stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version }}"
+stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_aarch64_version if kolla_base_arch == 'aarch64' else stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
+stackhpc_repo_centos_stream_9_storage_ceph_reef_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_aarch64_version if kolla_base_arch == 'aarch64' else stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version }}"
+stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_aarch64_version if kolla_base_arch == 'aarch64' else stackhpc_pulp_repo_centos_stream_9_docker_version }}"
+stackhpc_repo_rhel_9_treasuredata_5_version: "{{ stackhpc_pulp_repo_rhel_9_treasuredata_5_aarch64_version if kolla_base_arch == 'aarch64' else stackhpc_pulp_repo_rhel_9_treasuredata_5_version }}"
+stackhpc_repo_rhel_9_mariadb_10_11_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_11_aarch64_version if kolla_base_arch == 'aarch64' else stackhpc_pulp_repo_rhel_9_mariadb_10_11_version }}"
+stackhpc_repo_rhel_9_influxdb_version: "{{ stackhpc_pulp_repo_rhel_9_influxdb_aarch64_version if kolla_base_arch == 'aarch64' else stackhpc_pulp_repo_rhel_9_influxdb_version }}"
+stackhpc_repo_epel_9_version: "{{ stackhpc_pulp_repo_epel_9_aarch64_version if kolla_base_arch == 'aarch64' else stackhpc_pulp_repo_epel_9_version }}"
 stackhpc_repo_opensearch_2_x_version: "{{ stackhpc_pulp_repo_opensearch_2_x_version }}"
 stackhpc_repo_opensearch_dashboards_2_x_version: "{{ stackhpc_pulp_repo_opensearch_dashboards_2_x_version }}"
+
 ## Use derived vars from etc/kayobe/pulp.yml to switch between
 ## minor Rocky versions using stackhpc_pulp_repo_rocky_x_minor_version
 stackhpc_repo_rocky_9_baseos_version: "{{ stackhpc_pulp_repo_rocky_9_baseos_version }}"
 stackhpc_repo_rocky_9_appstream_version: "{{ stackhpc_pulp_repo_rocky_9_appstream_version }}"
 stackhpc_repo_rocky_9_extras_version: "{{ stackhpc_pulp_repo_rocky_9_extras_version }}"
 stackhpc_repo_rocky_9_crb_version: "{{ stackhpc_pulp_repo_rocky_9_crb_version }}"
 stackhpc_repo_rocky_9_highavailability_version: "{{ stackhpc_pulp_repo_rocky_9_highavailability_version }}"
-stackhpc_repo_rocky_9_sig_security_common_version: "{{ stackhpc_pulp_repo_rocky_9_sig_security_common_version }}"
+stackhpc_repo_rocky_9_sig_security_common_version: "{{ stackhpc_pulp_repo_rocky_9_sig_security_common_aarch64_version if kolla_base_arch == 'aarch64' else stackhpc_pulp_repo_rocky_9_sig_security_common_version }}"
 
 # Rocky-and-CI-specific Pulp urls
 stackhpc_include_os_minor_version_in_repo_url: true

etc/kayobe/pulp-repo-versions.yml

@@ -1,23 +1,34 @@
 ---
 # Do not edit! This file is autogenerated by Ansible.
 stackhpc_pulp_repo_centos_stream_9_docker_version: 20240829T093746
+stackhpc_pulp_repo_centos_stream_9_docker_aarch64_version: 20241001T011548
 stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20240829T093746
+stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_aarch64_version: 20241001T011548
 stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version: 20240902T080424
+stackhpc_pulp_repo_centos_stream_9_openstack_caracal_aarch64_version: 20241001T011548
 stackhpc_pulp_repo_centos_stream_9_opstools_version: 20231213T031318
+stackhpc_pulp_repo_centos_stream_9_opstools_aarch64_version: 20241001T011548
 stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_version: 20240502T000614
+stackhpc_pulp_repo_centos_stream_9_storage_ceph_reef_aarch64_version: 20241001T011548
 stackhpc_pulp_repo_docker_ce_ubuntu_jammy_version: 20240910T001721
 stackhpc_pulp_repo_elrepo_9_version: 20240902T122220
+stackhpc_pulp_repo_elrepo_9_aarch64_version: 20241001T011548
 stackhpc_pulp_repo_epel_9_version: 20240902T080424
+stackhpc_pulp_repo_epel_9_aarch64_version: 20241001T011548
 stackhpc_pulp_repo_grafana_version: 20240902T080424
 stackhpc_pulp_repo_opensearch_2_x_version: 20240807T235120
 stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20240807T235120
 stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20240925T093206
+stackhpc_pulp_repo_rhel9_rabbitmq_erlang_aarch64_version: 20241001T011548
 stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20240925T111913
 stackhpc_pulp_repo_rhel_9_influxdb_version: 20240817T001913
+stackhpc_pulp_repo_rhel_9_influxdb_aarch64_version: 20241001T011548
 stackhpc_pulp_repo_rhel_9_mariadb_10_11_version: 20240810T001640
+stackhpc_pulp_repo_rhel_9_mariadb_10_11_aarch64_version: 20241001T011548
 stackhpc_pulp_repo_rhel_9_rabbitmq_erlang_version: 20240711T091318
 stackhpc_pulp_repo_rhel_9_rabbitmq_server_version: 20240711T091318
 stackhpc_pulp_repo_rhel_9_treasuredata_5_version: 20240711T091318
+stackhpc_pulp_repo_rhel_9_treasuredata_5_aarch64_version: 20241001T011548
 stackhpc_pulp_repo_rocky_9_1_appstream_version: 20231207T013715
 stackhpc_pulp_repo_rocky_9_1_baseos_version: 20231206T014015
 stackhpc_pulp_repo_rocky_9_1_crb_version: 20231211T120328
@@ -34,11 +45,17 @@ stackhpc_pulp_repo_rocky_9_3_crb_version: 20240429T003818
 stackhpc_pulp_repo_rocky_9_3_extras_version: 20240506T000343
 stackhpc_pulp_repo_rocky_9_3_highavailability_version: 20240510T001129
 stackhpc_pulp_repo_rocky_9_4_appstream_version: 20240816T002610
+stackhpc_pulp_repo_rocky_9_4_appstream_aarch64_version: 20241001T011548
 stackhpc_pulp_repo_rocky_9_4_baseos_version: 20240816T002610
+stackhpc_pulp_repo_rocky_9_4_baseos_aarch64_version: 20241001T011548
 stackhpc_pulp_repo_rocky_9_4_crb_version: 20240816T002610
+stackhpc_pulp_repo_rocky_9_4_crb_aarch64_version: 20241001T011548
 stackhpc_pulp_repo_rocky_9_4_extras_version: 20240816T002610
+stackhpc_pulp_repo_rocky_9_4_extras_version_aarch64: 20241001T011548
 stackhpc_pulp_repo_rocky_9_4_highavailability_version: 20240816T002610
+stackhpc_pulp_repo_rocky_9_4_highavailability_version_aarch64: 20241001T011548
 stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20240718T001130
+stackhpc_pulp_repo_rocky_9_sig_security_common_version_aarch64: 20241001T011548
 stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20240911T041957
 stackhpc_pulp_repo_ubuntu_jammy_security_version: 20240911T063424
 stackhpc_pulp_repo_ubuntu_jammy_version: 20240911T063424

etc/kayobe/pulp.yml

@@ -208,11 +208,30 @@ stackhpc_pulp_sync_rocky_9: "{{ os_distribution == 'rocky' }}"
 stackhpc_pulp_repo_rocky_9_minor_version: 4
 # Rocky 9 Snapshot versions. The defaults use the appropriate version from
 # pulp-repo-versions.yml for the selected minor release.
-stackhpc_pulp_repo_rocky_9_appstream_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_%s_appstream_version' % stackhpc_pulp_repo_rocky_9_minor_version) }}"
-stackhpc_pulp_repo_rocky_9_baseos_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_%s_baseos_version' % stackhpc_pulp_repo_rocky_9_minor_version) }}"
-stackhpc_pulp_repo_rocky_9_extras_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_%s_extras_version' % stackhpc_pulp_repo_rocky_9_minor_version) }}"
-stackhpc_pulp_repo_rocky_9_crb_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_%s_crb_version' % stackhpc_pulp_repo_rocky_9_minor_version) }}"
-stackhpc_pulp_repo_rocky_9_highavailability_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_%s_highavailability_version' % stackhpc_pulp_repo_rocky_9_minor_version) }}"
+stackhpc_repo_rocky_9_baseos_version: >
+  {{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_%s_baseos%s_version' %
+  (stackhpc_pulp_repo_rocky_9_minor_version,
+   '_aarch64' if kolla_base_arch == 'aarch64' else '')) }}
+
+stackhpc_repo_rocky_9_appstream_version: >
+  {{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_%s_appstream%s_version' %
+  (stackhpc_pulp_repo_rocky_9_minor_version,
+   '_aarch64' if kolla_base_arch == 'aarch64' else '')) }}
+
+stackhpc_repo_rocky_9_extras_version: >
+  {{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_%s_extras%s_version' %
+  (stackhpc_pulp_repo_rocky_9_minor_version,
+   '_aarch64' if kolla_base_arch == 'aarch64' else '')) }}
+
+stackhpc_repo_rocky_9_crb_version: >
+  {{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_%s_crb%s_version' %
+  (stackhpc_pulp_repo_rocky_9_minor_version,
+   '_aarch64' if kolla_base_arch == 'aarch64' else '')) }}
+
+stackhpc_repo_rocky_9_highavailability_version: >
+  {{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_%s_highavailability%s_version' %
+  (stackhpc_pulp_repo_rocky_9_minor_version,
+   '_aarch64' if kolla_base_arch == 'aarch64' else '')) }}
 
 # Whether to sync packages common to all RHEL 9 derivatives.
 stackhpc_pulp_sync_el_9: "{{ stackhpc_pulp_sync_rocky_9 | bool }}"