Skip to content

Commit 0b6846f

Browse files
owenjonesowenjones
committed
Update to Rocky 10.2
Bump overcloud and container images to Rocky 10.2
1 parent 7d50e92 commit 0b6846f

6 files changed

Lines changed: 28 additions & 9 deletions

File tree

‎etc/kayobe/kolla-image-tags.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@
55
kolla_image_tags:
66
openstack:
77
rocky-9: 2025.1-rocky-9-20260603T214242
8-
rocky-10: 2025.1-rocky-10-20260603T214242
8+
rocky-10: 2025.1-rocky-10-20260611T135354
99
ubuntu-noble: 2025.1-ubuntu-noble-20260603T214242
1010
bifrost:
1111
rocky-9: 2025.1-rocky-9-20260205T152450
12-
rocky-10: 2025.1-rocky-10-20260423T154048
1312
ubuntu-noble: 2025.1-ubuntu-noble-20260205T152450
1413
ovn:
1514
rocky-9: 2025.1-rocky-9-20260608T100935
16-
rocky-10: 2025.1-rocky-10-20260609T095958

‎etc/kayobe/kolla/kolla-build.conf‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ apt_preferences = {{ lookup('env', 'KAYOBE_CONFIG_PATH') }}/environments/ci-buil
1010
{% if kolla_base_distro_version == '9' %}
1111
base_tag = 9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}
1212
{% elif kolla_base_distro_version == '10' %}
13-
base_tag = 10.{{ stackhpc_pulp_repo_rocky_10_minor_version }}
13+
# base_tag = 10.{{ stackhpc_pulp_repo_rocky_10_minor_version }}
14+
# note(owenjones): hardcoding to 10.1 until 10.2 image is available
15+
base_tag = 10.1
1416
{% endif %}
1517
# NOTE(Alex-Welsh): rpm_setup_config is intentionally left blank to override defaults
1618
rpm_setup_config =

‎etc/kayobe/pulp-host-image-versions.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
# These images must be in SMS, since they are used by our AIO CI runners
44
stackhpc_rocky_9_overcloud_host_image_version: 2025.1-20260520T124124
55
stackhpc_rocky_9_overcloud_host_image_version_aarch64: 2025.1-20260420T162634
6-
stackhpc_rocky_10_overcloud_host_image_version: 2025.1-20260420T162634
7-
stackhpc_rocky_10_overcloud_host_image_version_aarch64: 2025.1-20260420T162634
6+
stackhpc_rocky_10_overcloud_host_image_version: 2025.1-20260611T150558
7+
stackhpc_rocky_10_overcloud_host_image_version_aarch64: 2025.1-20260611T150558
88
stackhpc_ubuntu_noble_overcloud_host_image_version: 2025.1-20260420T162634

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,24 @@ stackhpc_pulp_repo_rocky_10_1_highavailability_version: 20260506T223941
7676
stackhpc_pulp_repo_rocky_10_1_security_aarch64_version: 20260510T225242
7777
stackhpc_pulp_repo_rocky_10_1_security_source_version: 20260510T222658
7878
stackhpc_pulp_repo_rocky_10_1_security_version: 20260510T223302
79+
stackhpc_pulp_repo_rocky_10_2_appstream_aarch64_version: 20260602T012631
80+
stackhpc_pulp_repo_rocky_10_2_appstream_source_version: 20260602T004048
81+
stackhpc_pulp_repo_rocky_10_2_appstream_version: 20260602T001113
82+
stackhpc_pulp_repo_rocky_10_2_baseos_aarch64_version: 20260602T012631
83+
stackhpc_pulp_repo_rocky_10_2_baseos_source_version: 20260602T004048
84+
stackhpc_pulp_repo_rocky_10_2_baseos_version: 20260602T011716
85+
stackhpc_pulp_repo_rocky_10_2_crb_aarch64_version: 20260602T012631
86+
stackhpc_pulp_repo_rocky_10_2_crb_source_version: 20260602T004048
87+
stackhpc_pulp_repo_rocky_10_2_crb_version: 20260602T001113
88+
stackhpc_pulp_repo_rocky_10_2_extras_aarch64_version: 20260602T012631
89+
stackhpc_pulp_repo_rocky_10_2_extras_source_version: 20260602T004048
90+
stackhpc_pulp_repo_rocky_10_2_extras_version: 20260602T001113
91+
stackhpc_pulp_repo_rocky_10_2_highavailability_aarch64_version: 20260602T012631
92+
stackhpc_pulp_repo_rocky_10_2_highavailability_source_version: 20260602T004048
93+
stackhpc_pulp_repo_rocky_10_2_highavailability_version: 20260602T001113
94+
stackhpc_pulp_repo_rocky_10_2_security_aarch64_version: 20260602T012631
95+
stackhpc_pulp_repo_rocky_10_2_security_source_version: 20260602T004048
96+
stackhpc_pulp_repo_rocky_10_2_security_version: 20260602T001113
7997
stackhpc_pulp_repo_rocky_9_1_appstream_version: 20231207T013715
8098
stackhpc_pulp_repo_rocky_9_1_baseos_version: 20231206T014015
8199
stackhpc_pulp_repo_rocky_9_1_crb_version: 20231211T120328

‎etc/kayobe/pulp.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,8 @@ stackhpc_pulp_rpm_architectures:
267267

268268
# Whether to sync Rocky Linux 10 packages.
269269
stackhpc_pulp_sync_rocky_10: "{{ os_distribution == 'rocky' and os_release == '10' }}"
270-
# Rocky 10 minor version number. Supported values: 1. Default is 1
271-
stackhpc_pulp_repo_rocky_10_minor_version: '1'
270+
# Rocky 10 minor version number. Supported values: 1, 2. Default is 2
271+
stackhpc_pulp_repo_rocky_10_minor_version: '2'
272272
# Rocky 10 Snapshot versions. The defaults use the appropriate version from
273273
# pulp-repo-versions.yml for the selected minor release.
274274

‎etc/kayobe/stackhpc-overcloud-dib.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,12 @@ stackhpc_overcloud_dib_elements:
3838
stackhpc_overcloud_dib_env_vars: "{{ stackhpc_overcloud_dib_env_vars_default | combine(stackhpc_overcloud_dib_env_vars_ark if stackhpc_build_overcloud_image_from_pulp_package_mirrors | bool else {}) }}"
3939

4040
# By default the :9 tag is used as base image. Here we want a specific minor version.
41+
# note(owenjones): Fixing Rocky 10 to 10.1 until 10.2 base images are released
4142
stackhpc_overcloud_dib_container_opts_default: >-
4243
{% if os_distribution == 'rocky' and os_release == '9' %}
4344
--build-arg=ROCKY_VERSION=9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}
4445
{% elif os_distribution == 'rocky' and os_release == '10' %}
45-
--build-arg=ROCKY_VERSION=10.{{ stackhpc_pulp_repo_rocky_10_minor_version }}
46+
--build-arg=ROCKY_VERSION=10.1
4647
{% endif %}
4748
4849
stackhpc_overcloud_dib_env_vars_default:

0 commit comments

Comments
 (0)