Skip to content

Commit a22e6e9

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Add centos/rocky 10 seed-images jobs"
2 parents 15353c0 + d5e6a9e commit a22e6e9

File tree

3 files changed

+40
-7
lines changed

3 files changed

+40
-7
lines changed

playbooks/kayobe-seed-base/overrides.yml.j2

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
---
2+
{% if ansible_facts.os_family == 'RedHat' and ansible_facts.distribution_major_version == '10' %}
3+
# Configure EPEL repository. Necessary for gdisk to be available.
4+
# dnf_install_epel and dnf_use_local_mirror are both necessary to trigger
5+
# templating of epel.repo. We use the official EPEL repository because there is
6+
# no OpenDev mirror for EL10.
7+
dnf_install_epel: true
8+
dnf_use_local_mirror: true
9+
{% endif %}
10+
211
docker_daemon_debug: true
312
# Use alternative registry image to avoid Docker Hub pull rate limit.
413
docker_registry_image_full: "quay.io/libpod/registry:2.8.2"
@@ -40,7 +49,9 @@ ipa_build_images: {{ build_images }}
4049
ipa_build_dib_elements_extra:
4150
# extra-hardware is currently failing on Ubuntu
4251
- "{% raw %}{{ 'extra-hardware' if os_distribution != 'ubuntu' else '' }}{% endraw %}"
43-
- "openstack-ci-mirrors"
52+
# Broken openstack-ci-mirrors for CentOS Stream 10. TODO(priteau): Remove
53+
# conditional once https://review.opendev.org/965344 is released.
54+
- "{% raw %}{{ 'openstack-ci-mirrors' if os_distribution != 'centos' else '' }}{% endraw %}"
4455

4556
# Workaround for limited tmpfs space in CI
4657
ipa_build_dib_env_extra:
@@ -49,10 +60,12 @@ ipa_build_dib_env_extra:
4960
# Build overcloud host image.
5061
overcloud_dib_build_host_images: {{ build_images }}
5162
overcloud_dib_elements_extra:
52-
- "openstack-ci-mirrors"
63+
# Broken openstack-ci-mirrors for CentOS Stream 10. TODO(priteau): Remove
64+
# conditional once https://review.opendev.org/965344 is released.
65+
- "{% raw %}{{ 'openstack-ci-mirrors' if os_distribution != 'centos' else '' }}{% endraw %}"
5366

54-
# NOTE(bbezak): Kolla does not build CentOS Stream 9 container images.
55-
# Using Rocky Linux 9 images on CentOS Stream 9 in CI.
67+
# NOTE(bbezak): Kolla does not build CentOS Stream 10 container images.
68+
# Using Rocky Linux 10 images on CentOS Stream 10 in CI.
5669
kolla_base_distro: "{% raw %}{{ 'rocky' if os_distribution == 'centos' else os_distribution }}{% endraw %}"
5770

5871
# Support overriding container_engine

zuul.d/jobs.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,12 @@
312312
nodeset: kayobe-centos9s
313313
voting: false
314314

315+
- job:
316+
name: kayobe-seed-images-centos10s
317+
parent: kayobe-seed-images-base
318+
nodeset: kayobe-centos10s
319+
voting: false
320+
315321
# Build only the base container image in the kayobe-seed-images-rocky9 job
316322
# which always runs. Use `check experimental` to run the other jobs which build
317323
# more images.
@@ -331,6 +337,20 @@
331337
vars:
332338
container_engine: podman
333339

340+
- job:
341+
name: kayobe-seed-images-rocky10
342+
parent: kayobe-seed-images-base
343+
nodeset: kayobe-rocky10
344+
vars:
345+
kayobe_control_host_become: false
346+
347+
- job:
348+
name: kayobe-seed-images-rocky10-podman
349+
parent: kayobe-seed-images-base
350+
nodeset: kayobe-rocky10
351+
vars:
352+
container_engine: podman
353+
334354
- job:
335355
name: kayobe-seed-images-ubuntu-noble
336356
parent: kayobe-seed-images-base

zuul.d/project.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@
7777
- kayobe-overcloud-tls-rocky9
7878
- kayobe-overcloud-upgrade-rocky9
7979
- kayobe-seed-centos10s
80-
- kayobe-seed-images-centos9s
81-
- kayobe-seed-images-rocky9
82-
- kayobe-seed-images-rocky9-podman
80+
- kayobe-seed-images-centos10s
81+
- kayobe-seed-images-rocky10
82+
- kayobe-seed-images-rocky10-podman
8383
- kayobe-seed-images-ubuntu-noble
8484
- kayobe-seed-images-ubuntu-noble-podman
8585
- kayobe-seed-rocky9

0 commit comments

Comments
 (0)