Skip to content

Commit ad3c5bd

Browse files
committed
Build Rocky Linux 10 container images
1 parent 214f521 commit ad3c5bd

File tree

8 files changed

+276
-65
lines changed

8 files changed

+276
-65
lines changed

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ on:
2323
type: boolean
2424
required: false
2525
default: true
26+
rocky-linux-10:
27+
description: Build Rocky Linux 10 images?
28+
type: boolean
29+
required: false
30+
default: true
2631
ubuntu-noble:
2732
description: Build Ubuntu Noble 24.04 images?
2833
type: boolean
@@ -66,7 +71,7 @@ jobs:
6671
steps:
6772
- name: Validate inputs
6873
run: |
69-
if [[ ${{ inputs.rocky-linux-9 }} == 'false' && ${{ inputs.ubuntu-noble }} == 'false' ]]; then
74+
if [[ ${{ inputs.rocky-linux-9 }} == 'false' && ${{ inputs.rocky-linux-10 }} == 'false' && ${{ inputs.ubuntu-noble }} == 'false' ]]; then
7075
echo "At least one distribution must be selected"
7176
exit 1
7277
fi
@@ -104,6 +109,10 @@ jobs:
104109
output+="{'name': 'rocky', 'release': 9, 'arch': 'amd64'},"
105110
output+="{'name': 'rocky', 'release': 9, 'arch': 'aarch64'},"
106111
fi
112+
if [[ ${{ inputs.rocky-linux-10 }} == 'true' ]]; then
113+
output+="{'name': 'rocky', 'release': 10, 'arch': 'amd64'},"
114+
output+="{'name': 'rocky', 'release': 10, 'arch': 'aarch64'},"
115+
fi
107116
if [[ ${{ inputs.ubuntu-noble }} == 'true' ]]; then
108117
output+="{'name': 'ubuntu', 'release': 'noble', 'arch': 'amd64'},"
109118
fi
@@ -346,7 +355,7 @@ jobs:
346355
create-manifests:
347356
# Only for Rocky Linux for now
348357
name: Create Multiarch Docker Manifests
349-
if: github.repository == 'stackhpc/stackhpc-kayobe-config' && inputs.push && inputs.rocky-linux-9
358+
if: github.repository == 'stackhpc/stackhpc-kayobe-config' && inputs.push && (inputs.rocky-linux-9 || inputs.rocky-linux-10)
350359
runs-on: ${{ needs.runner-selection.outputs.runner_name_container_image_build }}
351360
permissions: {}
352361
needs:

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ kolla_enable_neutron_sriov: true
2828
kolla_enable_octavia: true
2929
kolla_enable_opensearch: true
3030
kolla_enable_prometheus: true
31-
kolla_enable_redis: true
31+
kolla_enable_redis: "{{ kolla_base_distro_and_version in ['ubuntu-noble', 'rocky-9'] }}"
32+
kolla_enable_valkey: "{{ kolla_base_distro_and_version == 'rocky-10' }}"
3233
kolla_build_neutron_ovs: true
3334

3435
###############################################################################
@@ -58,15 +59,22 @@ stackhpc_repo_ubuntu_noble_version: "{{ stackhpc_pulp_repo_ubuntu_noble_version
5859
stackhpc_repo_ubuntu_noble_security_version: "{{ stackhpc_pulp_repo_ubuntu_noble_security_version }}"
5960
stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
6061
stackhpc_repo_docker_ce_ubuntu_noble_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_noble_version }}"
62+
stackhpc_repo_centos_stream_10_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_nfv_openvswitch_version }}"
63+
stackhpc_repo_centos_stream_10_openstack_epoxy_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_openstack_epoxy_version }}"
64+
stackhpc_repo_centos_stream_10_ovn_lts_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_ovn_lts_version }}"
65+
stackhpc_repo_centos_stream_10_storage_ceph_squid_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_storage_ceph_squid_version }}"
66+
stackhpc_repo_centos_stream_10_docker_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_10_docker_version }}"
6167
stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_9_nfv_openvswitch_version }}"
6268
stackhpc_repo_centos_stream_9_openstack_epoxy_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_9_openstack_epoxy_version }}"
6369
stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_9_opstools_version }}"
6470
stackhpc_repo_centos_stream_9_storage_ceph_squid_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_9_storage_ceph_squid_version }}"
6571
stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_multiarch_centos_stream_9_docker_version }}"
72+
stackhpc_repo_rhel_10_mariadb_10_11_version: "{{ stackhpc_pulp_repo_multiarch_rhel_10_mariadb_10_11_version }}"
6673
stackhpc_repo_rhel_9_treasuredata_5_version: "{{ stackhpc_pulp_repo_multiarch_rhel_9_treasuredata_5_version }}"
6774
stackhpc_repo_rhel_9_mariadb_10_11_version: "{{ stackhpc_pulp_repo_multiarch_rhel_9_mariadb_10_11_version }}"
6875
stackhpc_repo_rhel_9_influxdb_version: "{{ stackhpc_pulp_repo_multiarch_rhel_9_influxdb_version }}"
6976
stackhpc_repo_epel_9_version: "{{ stackhpc_pulp_repo_multiarch_epel_9_version }}"
77+
stackhpc_repo_epel_10_version: "{{ stackhpc_pulp_repo_multiarch_epel_10_version }}"
7078
stackhpc_repo_opensearch_2_x_version: "{{ stackhpc_pulp_repo_opensearch_2_x_version }}"
7179
stackhpc_repo_opensearch_dashboards_2_x_version: "{{ stackhpc_pulp_repo_opensearch_dashboards_2_x_version }}"
7280
stackhpc_repo_almalinux_9_proxysql_2_7_version: "{{ stackhpc_pulp_repo_almalinux_9_proxysql_2_7_version }}"
@@ -82,6 +90,10 @@ stackhpc_repo_rhel9_doca_version: "{{ stackhpc_pulp_repo_rhel9_doca_version }}"
8290

8391
stackhpc_repo_rocky_10_baseos_version: "{{ stackhpc_pulp_repo_rocky_10_baseos_version }}"
8492
stackhpc_repo_rocky_10_appstream_version: "{{ stackhpc_pulp_repo_rocky_10_appstream_version }}"
93+
stackhpc_repo_rocky_10_extras_version: "{{ stackhpc_pulp_repo_rocky_10_extras_version }}"
94+
stackhpc_repo_rocky_10_crb_version: "{{ stackhpc_pulp_repo_rocky_10_crb_version }}"
95+
stackhpc_repo_rocky_10_highavailability_version: "{{ stackhpc_pulp_repo_rocky_10_highavailability_version }}"
96+
stackhpc_repo_rhel10_doca_version: "{{ stackhpc_pulp_repo_rhel10_doca_version }}"
8597

8698
# Rocky-and-CI-specific Pulp urls
8799
stackhpc_include_os_minor_version_in_repo_url: true

0 commit comments

Comments
 (0)