diff --git a/playbooks/tripleo-buildimages/pre9.yaml b/playbooks/tripleo-buildimages/pre9.yaml index 01c8c590b..a0f3e2c96 100644 --- a/playbooks/tripleo-buildimages/pre9.yaml +++ b/playbooks/tripleo-buildimages/pre9.yaml @@ -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 become: true shell: cmd: | dnf config-manager --add-repo {{ item }} loop: - - "https://trunk.rdoproject.org/centos9-{{ release }}/{{ promote_source | default('consistent') }}/delorean.repo" - - https://trunk.rdoproject.org/centos9-{{ release }}/delorean-deps.repo + - "https://trunk.rdoproject.org/centos9-{{ ci_branch }}/{{ promote_source | default('current-tripleo') }}/delorean.repo" + - https://trunk.rdoproject.org/centos9-{{ ci_branch }}/delorean-deps.repo changed_when: true - name: Install vitualenv diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 7c5a85d91..8e09c92a7 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -788,6 +788,6 @@ description: | Base abstract job for tripleo-buildimage-* centos-9 jobs parent: tripleo-build-images-base-centos-8 - # nodeset: single-centos-9-node # TODO(marios) uncomment when available! + nodeset: single-centos-9-node vars: tripleo_image_os: centos9 diff --git a/zuul.d/build-image.yaml b/zuul.d/build-image.yaml index a91788c27..da85f5c70 100644 --- a/zuul.d/build-image.yaml +++ b/zuul.d/build-image.yaml @@ -57,6 +57,12 @@ - ^roles/oooci-build-images/.*$ - tripleo-buildimage-overcloud-hardened-uefi-full-centos-8-wallaby: 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: jobs: - tripleo-buildimage-overcloud-full-centos-7-train: @@ -93,6 +99,12 @@ files: *build_images_hardened_uefi_files - tripleo-buildimage-overcloud-hardened-uefi-full-centos-8-wallaby: 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: name: tripleo-buildimage-jobs @@ -108,6 +120,12 @@ files: *build_images_files - tripleo-buildimage-overcloud-hardened-uefi-full-centos-8: 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: jobs: - tripleo-buildimage-overcloud-full-centos-7: @@ -120,6 +138,12 @@ files: *build_images_files - tripleo-buildimage-overcloud-hardened-uefi-full-centos-8: 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: name: tripleo-buildimage-jobs-centos-8 @@ -140,10 +164,11 @@ - tripleo-buildimage-ironic-python-agent-centos-8 # CentOS 9 Image Build Jobs +# TODO(marios): enable wallaby in branches when ready - job: name: tripleo-buildimage-ironic-python-agent-centos-9 parent: tripleo-build-images-base-centos-9 - branches: ^(?!stable/(train|ussuri|victoria)).*$ + branches: ^(?!stable/(train|ussuri|victoria|wallaby)).*$ vars: tripleo_image_type: ironic-python-agent irrelevant-files: &build_image_irrelevant @@ -153,15 +178,16 @@ - job: name: tripleo-buildimage-overcloud-full-centos-9 parent: tripleo-build-images-base-centos-9 - branches: ^(?!stable/(train|ussuri|victoria)).*$ + branches: ^(?!stable/(train|ussuri|victoria|wallaby)).*$ vars: tripleo_image_type: overcloud-full + image_sanity: false # https://bugs.launchpad.net/tripleo/+bug/1950453 irrelevant-files: *build_image_irrelevant - job: name: tripleo-buildimage-overcloud-hardened-uefi-full-centos-9 parent: tripleo-build-images-base-centos-9 - branches: ^(?!stable/(train|ussuri|victoria)).*$ + branches: ^(?!stable/(train|ussuri|victoria|wallaby)).*$ vars: tripleo_image_type: overcloud-hardened-uefi-full irrelevant-files: *build_image_irrelevant