added Rocky Linux 10 AppStream/BaseOS url blocks and conditionals on build args to use these

Author: owenjones

etc/kayobe/pulp.yml

@@ -199,12 +199,17 @@ stackhpc_pulp_distribution_deb_production: >-
 # Content comes in from release repositories, via pinned repo versions.
 
 # Whether to sync Rocky Linux 9 packages.
-stackhpc_pulp_sync_rocky_9: "{{ os_distribution == 'rocky' }}"
+stackhpc_pulp_sync_rocky_9: "{{ os_distribution == 'rocky' && os_release == '9' }}"
 # Rocky 9 minor version number. Supported values: 6, 7. Default is 7
 stackhpc_pulp_repo_rocky_9_minor_version: '7'
 # Rocky 9 Snapshot versions. The defaults use the appropriate version from
 # pulp-repo-versions.yml for the selected minor release.
 
+#NOTE(owenjones): For now using separate rocky_10 variables, will look at abstracting major version
+#out to avoid making this file balloon in length
+stackhpc_pulp_sync_rocky_10: "{{ os_distribution == 'rocky' && os_release == '10' }}"
+stackhpc_pulp_repo_rocky_10_minor_version: '1'
+
 # Define the architecture suffix
 arch_suffix: "{{ '_aarch64' if kolla_base_arch == 'aarch64' else '' }}"
 

etc/kayobe/stackhpc-overcloud-dib.yml

@@ -39,7 +39,8 @@ stackhpc_overcloud_dib_env_vars: "{{ stackhpc_overcloud_dib_env_vars_default | c
 
 # By default the :9 tag is used as base image. Here we want a specific minor version.
 stackhpc_overcloud_dib_container_opts_default: >-
-    --build-arg=ROCKY_VERSION=9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}
+    {% if os_distribution == 'rocky' && os_release == '9' %}--build-arg=ROCKY_VERSION=9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}{% endif %}
+    {% if os_distribution == 'rocky' && os_release == '10' %}--build-arg=ROCKY_VERSION=10.{{ stackhpc_pulp_repo_rocky_10_minor_version }}{% endif %}
 
 stackhpc_overcloud_dib_env_vars_default:
   DIB_BLOCK_DEVICE_CONFIG: "{{ stackhpc_overcloud_dib_block_device_config_uefi_lvm }}"
@@ -67,7 +68,8 @@ stackhpc_overcloud_dib_env_vars_default:
 stackhpc_overcloud_dib_env_vars_ark:
   DIB_CONTAINERFILE_BUILDOPTS: >-
     --build-arg=ROCKY_USE_CUSTOM_DNF_MIRRORS=true
-    --build-arg=ROCKY_CUSTOM_DNF_MIRROR_URLS={{ [stackhpc_repo_rocky_9_baseos_url, stackhpc_repo_rocky_9_appstream_url] | join(',') }}
+    {% if os_distribution == 'rocky' && os_release == '9' %}--build-arg=ROCKY_CUSTOM_DNF_MIRROR_URLS={{ [stackhpc_repo_rocky_9_baseos_url, stackhpc_repo_rocky_9_appstream_url] | join(',') }}{% endif %}
+    {% if os_distribution == 'rocky' && os_release == '10' %}--build-arg=ROCKY_CUSTOM_DNF_MIRROR_URLS={{ [stackhpc_repo_rocky_10_baseos_url, stackhpc_repo_rocky_10_appstream_url] | join(',') }}{% endif %}
     {{ stackhpc_overcloud_dib_container_opts_default }}
   DIB_DISTRIBUTION_MIRROR: "{{ stackhpc_repo_ubuntu_noble_url if os_distribution == 'ubuntu' else '' }}"
   # Ensure upstream repofiles are re-enabled after image build, otherwise `yum.repos.d` is left empty

etc/kayobe/stackhpc.yml

@@ -26,6 +26,7 @@ stackhpc_repo_distribution: "development"
 stackhpc_include_os_minor_version_in_repo_url: false
 
 stackhpc_rocky_9_url_version: "{{ '9.' + stackhpc_pulp_repo_rocky_9_minor_version | string if stackhpc_include_os_minor_version_in_repo_url | bool else '9' }}"
+stackhpc_rocky_10_url_version: "{{ '10.' + stackhpc_pulp_repo_rocky_10_minor_version | string if stackhpc_include_os_minor_version_in_repo_url | bool else '10' }}"
 
 ###############################################################################
 # Debs
@@ -151,6 +152,14 @@ stackhpc_repo_epel_9_version: "{{ stackhpc_repo_distribution }}"
 stackhpc_repo_elrepo_9_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/elrepo/elrepo/el9/{{ kolla_base_arch }}/{{ stackhpc_repo_elrepo_9_version }}"
 stackhpc_repo_elrepo_9_version: "{{ stackhpc_repo_distribution }}"
 
+# Rocky 10 AppStream
+stackhpc_repo_rocky_10_appstream_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rocky/{{ stackhpc_rocky_10_url_version }}/AppStream/{{ kolla_base_arch }}/os/{{ stackhpc_repo_rocky_10_appstream_version }}"
+stackhpc_repo_rocky_10_appstream_version: "{{ stackhpc_repo_distribution }}"
+
+# Rocky 10 BaseOS
+stackhpc_repo_rocky_9_baseos_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rocky/{{ stackhpc_rocky_10_url_version }}/BaseOS/{{ kolla_base_arch }}/os/{{ stackhpc_repo_rocky_10_baseos_version }}"
+stackhpc_repo_rocky_9_baseos_version: "{{ stackhpc_repo_distribution }}"
+
 ###############################################################################
 # Sources