Wire up centos9 master buildimage jobs for check and gate

The job definitions are added at [1] and the new
single-centos-9-node nodeset is added in the parent at [2]

Also fixes issue with the 'release' var which is not present
in the check/gate version of these jobs so we try to discover
it using the relevant build-containers tasks.

This also disables the image_sanity check for overcloud-full
because of related-bug.

Finally adds wallaby to the branches negative match for c9
build jobs as we aren't ready for W yet.

Related-Bug: 1950453

[1] https://review.opendev.org/c/openstack/tripleo-ci/+/813618
[2] https://review.opendev.org/c/openstack/tripleo-ci/+/816821

Change-Id: I5c78c975afa3efb2c478339cacd006e064b24e71
This commit is contained in:
Marios Andreou 2021-10-22 13:44:13 +03:00
parent e6a036545a
commit 9942c04a5f
3 changed files with 37 additions and 6 deletions

View File

@ -1,12 +1,17 @@
--- ---
- name: Set the ci_branch fact
include_role:
name: build-containers
tasks_from: set_ci_branch.yml
- name: get extra repos delorean and deps - name: get extra repos delorean and deps
become: true become: true
shell: shell:
cmd: | cmd: |
dnf config-manager --add-repo {{ item }} dnf config-manager --add-repo {{ item }}
loop: loop:
- "https://trunk.rdoproject.org/centos9-{{ release }}/{{ promote_source | default('consistent') }}/delorean.repo" - "https://trunk.rdoproject.org/centos9-{{ ci_branch }}/{{ promote_source | default('current-tripleo') }}/delorean.repo"
- https://trunk.rdoproject.org/centos9-{{ release }}/delorean-deps.repo - https://trunk.rdoproject.org/centos9-{{ ci_branch }}/delorean-deps.repo
changed_when: true changed_when: true
- name: Install vitualenv - name: Install vitualenv

View File

@ -788,6 +788,6 @@
description: | description: |
Base abstract job for tripleo-buildimage-* centos-9 jobs Base abstract job for tripleo-buildimage-* centos-9 jobs
parent: tripleo-build-images-base-centos-8 parent: tripleo-build-images-base-centos-8
# nodeset: single-centos-9-node # TODO(marios) uncomment when available! nodeset: single-centos-9-node
vars: vars:
tripleo_image_os: centos9 tripleo_image_os: centos9

View File

@ -57,6 +57,12 @@
- ^roles/oooci-build-images/.*$ - ^roles/oooci-build-images/.*$
- tripleo-buildimage-overcloud-hardened-uefi-full-centos-8-wallaby: - tripleo-buildimage-overcloud-hardened-uefi-full-centos-8-wallaby:
files: *build_images_hardened_uefi_files files: *build_images_hardened_uefi_files
- tripleo-buildimage-overcloud-full-centos-9:
files: *build_images_files
- tripleo-buildimage-ironic-python-agent-centos-9:
files: *build_images_files
- tripleo-buildimage-overcloud-hardened-uefi-full-centos-9:
files: *build_images_hardened_uefi_files
gate: gate:
jobs: jobs:
- tripleo-buildimage-overcloud-full-centos-7-train: - tripleo-buildimage-overcloud-full-centos-7-train:
@ -93,6 +99,12 @@
files: *build_images_hardened_uefi_files files: *build_images_hardened_uefi_files
- tripleo-buildimage-overcloud-hardened-uefi-full-centos-8-wallaby: - tripleo-buildimage-overcloud-hardened-uefi-full-centos-8-wallaby:
files: *build_images_hardened_uefi_files files: *build_images_hardened_uefi_files
- tripleo-buildimage-overcloud-full-centos-9:
files: *build_images_files
- tripleo-buildimage-ironic-python-agent-centos-9:
files: *build_images_files
- tripleo-buildimage-overcloud-hardened-uefi-full-centos-9:
files: *build_images_hardened_uefi_files
- project-template: - project-template:
name: tripleo-buildimage-jobs name: tripleo-buildimage-jobs
@ -108,6 +120,12 @@
files: *build_images_files files: *build_images_files
- tripleo-buildimage-overcloud-hardened-uefi-full-centos-8: - tripleo-buildimage-overcloud-hardened-uefi-full-centos-8:
files: *build_images_hardened_uefi_files files: *build_images_hardened_uefi_files
- tripleo-buildimage-overcloud-full-centos-9:
files: *build_images_files
- tripleo-buildimage-ironic-python-agent-centos-9:
files: *build_images_files
- tripleo-buildimage-overcloud-hardened-uefi-full-centos-9:
files: *build_images_hardened_uefi_files
gate: gate:
jobs: jobs:
- tripleo-buildimage-overcloud-full-centos-7: - tripleo-buildimage-overcloud-full-centos-7:
@ -120,6 +138,12 @@
files: *build_images_files files: *build_images_files
- tripleo-buildimage-overcloud-hardened-uefi-full-centos-8: - tripleo-buildimage-overcloud-hardened-uefi-full-centos-8:
files: *build_images_hardened_uefi_files files: *build_images_hardened_uefi_files
- tripleo-buildimage-overcloud-full-centos-9:
files: *build_images_files
- tripleo-buildimage-ironic-python-agent-centos-9:
files: *build_images_files
- tripleo-buildimage-overcloud-hardened-uefi-full-centos-9:
files: *build_images_hardened_uefi_files
- project-template: - project-template:
name: tripleo-buildimage-jobs-centos-8 name: tripleo-buildimage-jobs-centos-8
@ -140,10 +164,11 @@
- tripleo-buildimage-ironic-python-agent-centos-8 - tripleo-buildimage-ironic-python-agent-centos-8
# CentOS 9 Image Build Jobs # CentOS 9 Image Build Jobs
# TODO(marios): enable wallaby in branches when ready
- job: - job:
name: tripleo-buildimage-ironic-python-agent-centos-9 name: tripleo-buildimage-ironic-python-agent-centos-9
parent: tripleo-build-images-base-centos-9 parent: tripleo-build-images-base-centos-9
branches: ^(?!stable/(train|ussuri|victoria)).*$ branches: ^(?!stable/(train|ussuri|victoria|wallaby)).*$
vars: vars:
tripleo_image_type: ironic-python-agent tripleo_image_type: ironic-python-agent
irrelevant-files: &build_image_irrelevant irrelevant-files: &build_image_irrelevant
@ -153,15 +178,16 @@
- job: - job:
name: tripleo-buildimage-overcloud-full-centos-9 name: tripleo-buildimage-overcloud-full-centos-9
parent: tripleo-build-images-base-centos-9 parent: tripleo-build-images-base-centos-9
branches: ^(?!stable/(train|ussuri|victoria)).*$ branches: ^(?!stable/(train|ussuri|victoria|wallaby)).*$
vars: vars:
tripleo_image_type: overcloud-full tripleo_image_type: overcloud-full
image_sanity: false # https://bugs.launchpad.net/tripleo/+bug/1950453
irrelevant-files: *build_image_irrelevant irrelevant-files: *build_image_irrelevant
- job: - job:
name: tripleo-buildimage-overcloud-hardened-uefi-full-centos-9 name: tripleo-buildimage-overcloud-hardened-uefi-full-centos-9
parent: tripleo-build-images-base-centos-9 parent: tripleo-build-images-base-centos-9
branches: ^(?!stable/(train|ussuri|victoria)).*$ branches: ^(?!stable/(train|ussuri|victoria|wallaby)).*$
vars: vars:
tripleo_image_type: overcloud-hardened-uefi-full tripleo_image_type: overcloud-hardened-uefi-full
irrelevant-files: *build_image_irrelevant irrelevant-files: *build_image_irrelevant