openstack
/
tripleo-ci
Code Issues Proposed changes

Adds new tripleo-ci-buildimage-jobs template for branchless repos 

This adds a tripleo-ci-buildimage-jobs template for the buildimage
jobs definitions to be used in the branchless repos similar to the
tripleo-ci-build-containers template. Also adds missing branches:
master for -train -ussuri jobs and makes the buildimage hardened
jobs voting. Also marks train jobs as non-voting due to #1881732

This patch was originally posted after discussion in the parent review
at [1]. The Depends-On is for failing build-containers-centos-8-ussuri

[1] https://review.opendev.org/#/c/722790/

Partial-Bug: #1881732
Depends-On: https://review.opendev.org/733790
Change-Id: I85a1c0a102613a88c31cd62554e5cfcc79423b17
This commit is contained in:
Marios Andreou 2020-05-26 14:30:32 +03:00
parent e533477eb3
commit 8935334865
3 changed files with 60 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zuul.d/build-containers.yaml
View File

@ -6,9 +6,7 @@
name: tripleo-ci-build-containers-jobs
check:
jobs:
- tripleo-build-containers-centos-7
- tripleo-build-containers-centos-7-rocky
- tripleo-build-containers-centos-7-buildah
- tripleo-build-containers-centos-7-buildah-train
- tripleo-build-containers-centos-7-buildah-stein
- tripleo-build-containers-centos-8
@ -16,9 +14,7 @@
gate:
queue: tripleo
jobs:
- tripleo-build-containers-centos-7
- tripleo-build-containers-centos-7-rocky
- tripleo-build-containers-centos-7-buildah
- tripleo-build-containers-centos-7-buildah-stein
- tripleo-build-containers-centos-7-buildah-train
- tripleo-build-containers-centos-8

67
zuul.d/build-image.yaml
View File

@ -2,27 +2,66 @@
# zuul.d/build-image.yaml
# Zuul layout for TripleO Build Image jobs.
- project-template:
name: tripleo-ci-buildimage-jobs
check:
jobs:
- tripleo-buildimage-overcloud-full-centos-7-train:
files: &build_images_files
- ^playbooks/tripleo-buildimages/.*$
- ^roles/oooci-build-images/.*$
- zuul.d/layout.yaml
- zuul.d/build-image.yaml
- tripleo-buildimage-ironic-python-agent-centos-7-train:
files: *build_images_files
- tripleo-buildimage-overcloud-full-centos-8:
files: *build_images_files
- tripleo-buildimage-overcloud-full-centos-8-ussuri:
files: *build_images_files
- tripleo-buildimage-ironic-python-agent-centos-8:
files: *build_images_files
- tripleo-buildimage-ironic-python-agent-centos-8-ussuri:
files: *build_images_files
- tripleo-buildimage-overcloud-hardened-full-centos-8:
files: *build_images_files
- tripleo-buildimage-overcloud-hardened-full-centos-8-ussuri:
files: *build_images_files
gate:
jobs:
- tripleo-buildimage-overcloud-full-centos-7-train:
files: *build_images_files
- tripleo-buildimage-ironic-python-agent-centos-7-train:
files: *build_images_files
- tripleo-buildimage-overcloud-full-centos-8:
files: *build_images_files
- tripleo-buildimage-overcloud-full-centos-8-ussuri:
files: *build_images_files
- tripleo-buildimage-ironic-python-agent-centos-8:
files: *build_images_files
- tripleo-buildimage-ironic-python-agent-centos-8-ussuri:
files: *build_images_files
- tripleo-buildimage-overcloud-hardened-full-centos-8:
files: *build_images_files
- tripleo-buildimage-overcloud-hardened-full-centos-8-ussuri:
files: *build_images_files
- project-template:
name: tripleo-buildimage-jobs
check:
jobs:
- tripleo-buildimage-overcloud-full-centos-7
- tripleo-buildimage-overcloud-full-centos-7-train
- tripleo-buildimage-overcloud-full-centos-8
- tripleo-buildimage-overcloud-full-centos-8-ussuri
- tripleo-buildimage-ironic-python-agent-centos-7
- tripleo-buildimage-ironic-python-agent-centos-8
gate:
jobs:
- tripleo-buildimage-overcloud-full-centos-7
- tripleo-buildimage-overcloud-full-centos-8
- tripleo-buildimage-overcloud-full-centos-7-train
- tripleo-buildimage-ironic-python-agent-centos-7
- tripleo-buildimage-ironic-python-agent-centos-8
- tripleo-buildimage-overcloud-full-centos-8-ussuri
experimental:
jobs:
- tripleo-buildimage-ironic-python-agent-centos-7
- tripleo-buildimage-overcloud-hardened-full-centos-7
- tripleo-buildimage-ironic-python-agent-centos-8
- tripleo-buildimage-overcloud-hardened-full-centos-8
- project-template:
@ -67,7 +106,6 @@
branches: ^(?!stable/(queens|rocky|stein|train)).*$
vars:
tripleo_image_type: overcloud-hardened-full
voting: false
irrelevant-files:
- ^.*\.rst$
- ^releasenotes/.*$
@ -102,6 +140,7 @@
- job:
name: tripleo-buildimage-overcloud-full-centos-7-train
parent: tripleo-build-images-base
branches: master
override-checkout: 'stable/train'
vars:
tripleo_image_type: overcloud-full
@ -111,6 +150,19 @@
- ^.*\.rst$
- ^releasenotes/.*$
- job:
name: tripleo-buildimage-ironic-python-agent-centos-7-train
parent: tripleo-build-images-base
branches: master
override-checkout: 'stable/train'
vars:
tripleo_image_type: ironic-python-agent
tripleo_image_os: centos7
branch_override: stable/train
irrelevant-files:
- ^.*\.rst$
- ^releasenotes/.*$
# CentOS 7 Image Build Jobs
- job:
name: tripleo-buildimage-ironic-python-agent-centos-7
@ -119,7 +171,6 @@
vars:
tripleo_image_type: ironic-python-agent
tripleo_image_os: centos7
voting: false
irrelevant-files:
- ^.*\.rst$
- ^releasenotes/.*$

25
zuul.d/layout.yaml
View File

@ -7,6 +7,7 @@
- project:
templates:
- tripleo-ci-build-containers-jobs
- tripleo-ci-buildimage-jobs
- tripleo-multinode-baremetal-full
- tripleo-multinode-branchful
- tripleo-multinode-container-full
@ -36,26 +37,6 @@
tox_environment:
PYTEST_REQPASS: 84
- tripleo-buildimage-overcloud-full-centos-8:
files: &build_images_files
- ^playbooks/tripleo-buildimages/.*$
- ^roles/oooci-build-images/.*$
- zuul.d/layout.yaml
- zuul.d/build-image.yaml
- tripleo-buildimage-ironic-python-agent-centos-8:
files: *build_images_files
- tripleo-buildimage-overcloud-hardened-full-centos-8:
files: *build_images_files
- tripleo-buildimage-overcloud-full-centos-8-ussuri:
files: *build_images_files
- tripleo-buildimage-overcloud-full-centos-7-train:
files: *build_images_files
- tripleo-buildimage-overcloud-full-centos-7:
files: *build_images_files
- tripleo-buildimage-ironic-python-agent-centos-7:
files: *build_images_files
- tripleo-buildimage-overcloud-hardened-full-centos-7:
files: *build_images_files
- tripleo-ci-centos-7-scenario001-multinode-oooq-container:
files:
- ^playbooks/tripleo-ci/.*$
@ -88,10 +69,6 @@
- tripleo-tox-molecule
- openstack-tox-py35:
files: *py_files
- tripleo-buildimage-overcloud-full-centos-7:
files: *build_images_files
- tripleo-buildimage-overcloud-full-centos-8:
files: *build_images_files
- tripleo-ci-centos-7-standalone-upgrade-train:
branches: master
- tripleo-ci-centos-7-standalone-upgrade-stein: