diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index 34b77bd0bb..dea6f6625d 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -4,9 +4,9 @@ # where the key is the OS distro and the value is the tag to deploy. kolla_image_tags: openstack: - rocky-9: 2025.1-rocky-9-20260603T214242 - rocky-10: 2025.1-rocky-10-20260603T214242 - ubuntu-noble: 2025.1-ubuntu-noble-20260603T214242 + rocky-9: 2025.1-rocky-9-20260604T210535 + rocky-10: 2025.1-rocky-10-20260604T210535 + ubuntu-noble: 2025.1-ubuntu-noble-20260604T210535 bifrost: rocky-9: 2025.1-rocky-9-20260205T152450 rocky-10: 2025.1-rocky-10-20260423T154048 diff --git a/etc/kayobe/kolla/kolla-build.conf b/etc/kayobe/kolla/kolla-build.conf index 21922e3f2c..f03a826c33 100644 --- a/etc/kayobe/kolla/kolla-build.conf +++ b/etc/kayobe/kolla/kolla-build.conf @@ -7,8 +7,11 @@ base_tag = noble-20241118.1 apt_preferences = {{ lookup('env', 'KAYOBE_CONFIG_PATH') }}/environments/ci-builder/builder-apt-preferences {# Similarly pinning to Rocky 9 minor version used in our repos #} {% elif kolla_base_distro == 'rocky' %} -{% if kolla_base_distro_version == '9' %} +# NOTE(priteau): Temporary workaround while 9.8 container images are missing +{% if kolla_base_distro_version == '9' and stackhpc_pulp_repo_rocky_9_minor_version | int != 8 %} base_tag = 9.{{ stackhpc_pulp_repo_rocky_9_minor_version }} +{% elif kolla_base_distro_version == '9' %} +base_tag = 9 {% elif kolla_base_distro_version == '10' %} base_tag = 10.{{ stackhpc_pulp_repo_rocky_10_minor_version }} {% endif %} diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index 653cb9ae55..8983ff7a85 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -2,26 +2,26 @@ # This file is autogenerated by Ansible using the following workflow: # https://github.com/stackhpc/stackhpc-release-train/actions/workflows/package-update-kayobe.yml stackhpc_pulp_repo_almalinux_9_proxysql_2_7_version: 20250627T134211 -stackhpc_pulp_repo_centos_stream_10_docker_aarch64_version: 20260506T232721 -stackhpc_pulp_repo_centos_stream_10_docker_version: 20260506T205129 -stackhpc_pulp_repo_centos_stream_10_nfv_openvswitch_aarch64_version: 20260421T225912 -stackhpc_pulp_repo_centos_stream_10_nfv_openvswitch_version: 20260421T222634 +stackhpc_pulp_repo_centos_stream_10_docker_aarch64_version: 20260603T233007 +stackhpc_pulp_repo_centos_stream_10_docker_version: 20260603T212140 +stackhpc_pulp_repo_centos_stream_10_nfv_openvswitch_aarch64_version: 20260603T233007 +stackhpc_pulp_repo_centos_stream_10_nfv_openvswitch_version: 20260602T230909 stackhpc_pulp_repo_centos_stream_10_openstack_epoxy_aarch64_version: 20260227T222400 stackhpc_pulp_repo_centos_stream_10_openstack_epoxy_version: 20260227T214730 stackhpc_pulp_repo_centos_stream_10_ovn_lts_aarch64_version: 20260327T163952 stackhpc_pulp_repo_centos_stream_10_ovn_lts_version: 20260327T163952 -stackhpc_pulp_repo_centos_stream_10_storage_ceph_squid_aarch64_version: 20260220T152827 -stackhpc_pulp_repo_centos_stream_10_storage_ceph_squid_version: 20260220T152827 -stackhpc_pulp_repo_centos_stream_9_docker_aarch64_version: 20260506T224443 -stackhpc_pulp_repo_centos_stream_9_docker_version: 20260506T205129 -stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_aarch64_version: 20260421T223857 -stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20260421T222634 +stackhpc_pulp_repo_centos_stream_10_storage_ceph_squid_aarch64_version: 20260603T233007 +stackhpc_pulp_repo_centos_stream_10_storage_ceph_squid_version: 20260602T230909 +stackhpc_pulp_repo_centos_stream_9_docker_aarch64_version: 20260603T230620 +stackhpc_pulp_repo_centos_stream_9_docker_version: 20260603T212140 +stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_aarch64_version: 20260602T230751 +stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20260602T230909 stackhpc_pulp_repo_centos_stream_9_openstack_epoxy_aarch64_version: 20250521T015033 stackhpc_pulp_repo_centos_stream_9_openstack_epoxy_version: 20250521T021940 stackhpc_pulp_repo_centos_stream_9_opstools_aarch64_version: 20240927T073838 stackhpc_pulp_repo_centos_stream_9_opstools_version: 20231213T031318 -stackhpc_pulp_repo_centos_stream_9_storage_ceph_squid_aarch64_version: 20250731T023010 -stackhpc_pulp_repo_centos_stream_9_storage_ceph_squid_version: 20250731T030732 +stackhpc_pulp_repo_centos_stream_9_storage_ceph_squid_aarch64_version: 20260603T230620 +stackhpc_pulp_repo_centos_stream_9_storage_ceph_squid_version: 20260603T230019 stackhpc_pulp_repo_doca_2_9_1_rhel9_4_modules_version: 20241213T112245 stackhpc_pulp_repo_doca_2_9_1_rhel9_4_version: 20241211T153620 stackhpc_pulp_repo_doca_2_9_1_rhel9_5_modules_version: 20250115T150314 @@ -34,28 +34,28 @@ stackhpc_pulp_repo_doca_3_2_2_rhel9_7_modules_aarch64_version: 20260424T151043 stackhpc_pulp_repo_doca_3_2_2_rhel9_7_modules_version: 20260424T151043 stackhpc_pulp_repo_doca_3_2_2_rhel9_aarch64_version: 20260326T091359 stackhpc_pulp_repo_doca_3_2_2_rhel9_version: 20260326T091359 -stackhpc_pulp_repo_docker_ce_ubuntu_noble_version: 20260506T205129 +stackhpc_pulp_repo_docker_ce_ubuntu_noble_version: 20260606T204310 stackhpc_pulp_repo_elrepo_10_aarch64_version: 20260220T152827 -stackhpc_pulp_repo_elrepo_10_version: 20260426T213637 +stackhpc_pulp_repo_elrepo_10_version: 20260605T232644 stackhpc_pulp_repo_elrepo_9_aarch64_version: 20250408T030629 -stackhpc_pulp_repo_elrepo_9_version: 20260426T203635 -stackhpc_pulp_repo_epel_10_aarch64_version: 20260505T223913 -stackhpc_pulp_repo_epel_10_version: 20260506T215737 -stackhpc_pulp_repo_epel_9_aarch64_version: 20260506T224443 -stackhpc_pulp_repo_epel_9_version: 20260506T215737 -stackhpc_pulp_repo_grafana_version: 20260506T205914 +stackhpc_pulp_repo_elrepo_9_version: 20260605T220811 +stackhpc_pulp_repo_epel_10_aarch64_version: 20260607T232329 +stackhpc_pulp_repo_epel_10_version: 20260607T215516 +stackhpc_pulp_repo_epel_9_aarch64_version: 20260607T222638 +stackhpc_pulp_repo_epel_9_version: 20260607T215516 +stackhpc_pulp_repo_grafana_version: 20260605T210001 stackhpc_pulp_repo_opensearch_2_x_version: 20260312T214445 stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20260312T214445 stackhpc_pulp_repo_rhel9_rabbitmq_erlang_26_aarch64_version: 20260112T224827 stackhpc_pulp_repo_rhel9_rabbitmq_erlang_27_aarch64_version: 20260112T224827 stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20260423T205618 -stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20260423T205618 -stackhpc_pulp_repo_rhel_10_mariadb_10_11_aarch64_version: 20260220T152827 -stackhpc_pulp_repo_rhel_10_mariadb_10_11_version: 20260220T152827 +stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20260525T211035 +stackhpc_pulp_repo_rhel_10_mariadb_10_11_aarch64_version: 20260527T210633 +stackhpc_pulp_repo_rhel_10_mariadb_10_11_version: 20260527T210633 stackhpc_pulp_repo_rhel_9_influxdb_aarch64_version: 20260112T224827 -stackhpc_pulp_repo_rhel_9_influxdb_version: 20260506T205410 -stackhpc_pulp_repo_rhel_9_mariadb_10_11_aarch64_version: 20260204T223146 -stackhpc_pulp_repo_rhel_9_mariadb_10_11_version: 20260204T213517 +stackhpc_pulp_repo_rhel_9_influxdb_version: 20260601T225803 +stackhpc_pulp_repo_rhel_9_mariadb_10_11_aarch64_version: 20260527T210633 +stackhpc_pulp_repo_rhel_9_mariadb_10_11_version: 20260527T210633 stackhpc_pulp_repo_rhel_9_treasuredata_5_aarch64_version: 20251219T213344 stackhpc_pulp_repo_rhel_9_treasuredata_5_version: 20251219T202129 stackhpc_pulp_repo_rocky_10_1_appstream_aarch64_version: 20260506T232721 @@ -134,9 +134,27 @@ stackhpc_pulp_repo_rocky_9_7_highavailability_version: 20260514T220209 stackhpc_pulp_repo_rocky_9_7_security_aarch64_version: 20260519T222921 stackhpc_pulp_repo_rocky_9_7_security_source_version: 20260520T222157 stackhpc_pulp_repo_rocky_9_7_security_version: 20260520T215442 +stackhpc_pulp_repo_rocky_9_8_appstream_aarch64_version: 20260605T230645 +stackhpc_pulp_repo_rocky_9_8_appstream_source_version: 20260605T225017 +stackhpc_pulp_repo_rocky_9_8_appstream_version: 20260605T221153 +stackhpc_pulp_repo_rocky_9_8_baseos_aarch64_version: 20260605T230645 +stackhpc_pulp_repo_rocky_9_8_baseos_source_version: 20260605T225017 +stackhpc_pulp_repo_rocky_9_8_baseos_version: 20260606T221517 +stackhpc_pulp_repo_rocky_9_8_crb_aarch64_version: 20260605T230645 +stackhpc_pulp_repo_rocky_9_8_crb_source_version: 20260531T220752 +stackhpc_pulp_repo_rocky_9_8_crb_version: 20260605T221153 +stackhpc_pulp_repo_rocky_9_8_extras_aarch64_version: 20260528T223707 +stackhpc_pulp_repo_rocky_9_8_extras_source_version: 20260528T220844 +stackhpc_pulp_repo_rocky_9_8_extras_version: 20260528T220059 +stackhpc_pulp_repo_rocky_9_8_highavailability_aarch64_version: 20260528T223707 +stackhpc_pulp_repo_rocky_9_8_highavailability_source_version: 20260528T220844 +stackhpc_pulp_repo_rocky_9_8_highavailability_version: 20260528T220059 +stackhpc_pulp_repo_rocky_9_8_security_aarch64_version: 20260605T230645 +stackhpc_pulp_repo_rocky_9_8_security_source_version: 20260605T225017 +stackhpc_pulp_repo_rocky_9_8_security_version: 20260606T214954 stackhpc_pulp_repo_rocky_9_sig_security_common_aarch64_version: 20260305T225932 stackhpc_pulp_repo_rocky_9_sig_security_common_source_version: 20260305T224636 stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20260305T222525 -stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20260506T232713 -stackhpc_pulp_repo_ubuntu_noble_security_version: 20260507T015832 -stackhpc_pulp_repo_ubuntu_noble_version: 20260507T015832 +stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20260607T231727 +stackhpc_pulp_repo_ubuntu_noble_security_version: 20260608T021126 +stackhpc_pulp_repo_ubuntu_noble_version: 20260608T021126 diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index b766ab5a9c..670417a3d2 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -208,8 +208,8 @@ stackhpc_pulp_distribution_deb_production: >- # Whether to sync Rocky Linux 9 packages. stackhpc_pulp_sync_rocky_9: "{{ os_distribution == 'rocky' and 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 minor version number. Supported values: 6, 7, 8. Default is 8. +stackhpc_pulp_repo_rocky_9_minor_version: '8' # Rocky 9 Snapshot versions. The defaults use the appropriate version from # pulp-repo-versions.yml for the selected minor release.