Use tripleo-ci-build-images-required-projects-upstream as parent
Based on CS job parenting re-structure[1], for container build jobs, It follows the following inheritance * tripleo-ci-base-common-required-projects * tripleo-ci-base * tripleo-ci-base-singlenode-standard * tripleo-ci-base-images-standard * tripleo-ci-build-images-required-projects-upstream For Distro specific * CentOS 7 tripleo-ci-build-images-required-projects-upstream * tripleo-build-images-base * CentOS 8 tripleo-ci-build-images-required-projects-upstream * tripleo-build-images-base-centos-8 * CentOS 9 tripleo-ci-build-images-required-projects-upstream * tripleo-build-images-base-centos-9 Note: It adds missing post-run playbook invocation part in tripleo-ci-base-images-standard. [1]. https://review.opendev.org/q/topic:cs-parenting Signed-off-by: Chandan Kumar (raukadah) <chkumar@redhat.com> Change-Id: Ibaf66d34368d87d2aa064b8c13802f686da09fec
This commit is contained in:
parent
17145d6440
commit
556b84c3fe
@ -670,88 +670,3 @@
|
||||
nodeset: single-centos-8-node
|
||||
required-projects:
|
||||
- opendev.org/openstack/tripleo-repos
|
||||
|
||||
- job:
|
||||
name: tripleo-build-images-base
|
||||
abstract: true
|
||||
description: |
|
||||
Base abstract job for tripleo-buildimage-* jobs
|
||||
parent: tripleo-ci-base-singlenode
|
||||
pre-run: playbooks/tripleo-buildimages/pre.yaml
|
||||
run: playbooks/tripleo-buildimages/run-v3.yaml
|
||||
post-run: playbooks/tripleo-buildimages/post.yaml
|
||||
timeout: 5400
|
||||
nodeset: single-centos-7-node
|
||||
required-projects:
|
||||
- opendev.org/openstack/diskimage-builder
|
||||
- opendev.org/openstack/heat-agents
|
||||
- opendev.org/openstack/instack-undercloud
|
||||
- opendev.org/openstack/ironic
|
||||
- opendev.org/openstack/ironic-python-agent
|
||||
- opendev.org/openstack/ironic-python-agent-builder
|
||||
- opendev.org/openstack/python-tripleoclient
|
||||
- opendev.org/openstack/tripleo-ansible
|
||||
- opendev.org/openstack/tripleo-common
|
||||
- opendev.org/openstack/tripleo-image-elements
|
||||
- opendev.org/openstack/tripleo-puppet-elements
|
||||
- opendev.org/openstack/tripleo-repos
|
||||
- opendev.org/openstack/requirements
|
||||
irrelevant-files: &irrelevant_build_img
|
||||
- ^zuul.d/build-containers.yaml
|
||||
- ^zuul.d/deprecated-jobs.yaml
|
||||
- ^zuul.d/multinode-jobs.yaml
|
||||
- ^zuul.d/periodic.yaml
|
||||
- ^zuul.d/standalone-jobs.yaml
|
||||
- ^zuul.d/undercloud-jobs.yaml
|
||||
|
||||
- job:
|
||||
name: tripleo-build-images-base-centos-8
|
||||
abstract: true
|
||||
description: |
|
||||
Base abstract job for tripleo-buildimage-* centos-8 jobs
|
||||
parent: tripleo-ci-base-singlenode-centos-8
|
||||
pre-run:
|
||||
- playbooks/tripleo-buildimages/pre.yaml
|
||||
- playbooks/tripleo-buildimages/tmpfiles.yaml
|
||||
run: playbooks/tripleo-buildimages/run-v3.yaml
|
||||
post-run: playbooks/tripleo-buildimages/post.yaml
|
||||
timeout: 5400
|
||||
nodeset: single-centos-8-node
|
||||
vars:
|
||||
tripleo_image_os: centos8
|
||||
required-projects:
|
||||
- opendev.org/openstack/diskimage-builder
|
||||
- opendev.org/openstack/heat-agents
|
||||
- opendev.org/openstack/instack-undercloud
|
||||
- opendev.org/openstack/ironic
|
||||
- opendev.org/openstack/ironic-python-agent
|
||||
- opendev.org/openstack/ironic-python-agent-builder
|
||||
- opendev.org/openstack/python-tripleoclient
|
||||
- opendev.org/openstack/tripleo-ansible
|
||||
- opendev.org/openstack/tripleo-common
|
||||
- opendev.org/openstack/tripleo-image-elements
|
||||
- opendev.org/openstack/tripleo-puppet-elements
|
||||
- opendev.org/openstack/tripleo-repos
|
||||
- opendev.org/openstack/requirements
|
||||
- opendev.org/openstack/tripleo-quickstart
|
||||
- opendev.org/openstack/tripleo-quickstart-extras
|
||||
irrelevant-files: *irrelevant_build_img
|
||||
roles:
|
||||
- zuul: opendev.org/openstack/tripleo-quickstart
|
||||
- zuul: opendev.org/openstack/tripleo-quickstart-extras
|
||||
|
||||
- job:
|
||||
name: tripleo-build-images-base-centos-9
|
||||
abstract: true
|
||||
description: |
|
||||
Base abstract job for tripleo-buildimage-* centos-9 jobs
|
||||
parent: tripleo-build-images-base-centos-8
|
||||
nodeset: single-centos-9-node
|
||||
vars:
|
||||
tripleo_image_os: centos9
|
||||
required-projects:
|
||||
- opendev.org/openstack/tripleo-quickstart
|
||||
- opendev.org/openstack/tripleo-quickstart-extras
|
||||
roles:
|
||||
- zuul: opendev.org/openstack/tripleo-quickstart
|
||||
- zuul: opendev.org/openstack/tripleo-quickstart-extras
|
||||
|
@ -1,5 +1,78 @@
|
||||
---
|
||||
# zuul.d/build-image.yaml
|
||||
|
||||
###############################################################
|
||||
# #
|
||||
# UPSTREAM BUILD IMAGES PARENTING #
|
||||
# #
|
||||
###############################################################
|
||||
|
||||
# This job definition holds the required projects
|
||||
# for upstream CI. The required projects are separated
|
||||
# out to allow for this job to be shadowed in another repo
|
||||
# and the required projects overwritten for other environments
|
||||
- job:
|
||||
name: tripleo-ci-build-images-required-projects-upstream
|
||||
description: |
|
||||
Base abstract job to add required-projects for Upstream
|
||||
Build Images Jobs
|
||||
abstract: true
|
||||
parent: tripleo-ci-base-images-standard
|
||||
required-projects:
|
||||
- opendev.org/openstack/diskimage-builder
|
||||
- opendev.org/openstack/heat-agents
|
||||
- opendev.org/openstack/instack-undercloud
|
||||
- opendev.org/openstack/ironic
|
||||
- opendev.org/openstack/ironic-python-agent
|
||||
- opendev.org/openstack/ironic-python-agent-builder
|
||||
- opendev.org/openstack/python-tripleoclient
|
||||
- opendev.org/openstack/tripleo-ansible
|
||||
- opendev.org/openstack/tripleo-common
|
||||
- opendev.org/openstack/tripleo-image-elements
|
||||
- opendev.org/openstack/tripleo-puppet-elements
|
||||
- opendev.org/openstack/requirements
|
||||
irrelevant-files: &irrelevant_build_img
|
||||
- ^zuul.d/build-containers.yaml
|
||||
- ^zuul.d/deprecated-jobs.yaml
|
||||
- ^zuul.d/multinode-jobs.yaml
|
||||
- ^zuul.d/periodic.yaml
|
||||
- ^zuul.d/standalone-jobs.yaml
|
||||
- ^zuul.d/undercloud-jobs.yaml
|
||||
|
||||
# CentOS 7
|
||||
|
||||
- job:
|
||||
name: tripleo-build-images-base
|
||||
abstract: true
|
||||
description: |
|
||||
Base abstract job for tripleo-buildimage-* centos-7 jobs
|
||||
parent: tripleo-ci-build-images-required-projects-upstream
|
||||
nodeset: single-centos-7-node
|
||||
|
||||
# CentOS 8
|
||||
- job:
|
||||
name: tripleo-build-images-base-centos-8
|
||||
abstract: true
|
||||
description: |
|
||||
Base abstract job for tripleo-buildimage-* centos-8 jobs
|
||||
parent: tripleo-ci-build-images-required-projects-upstream
|
||||
nodeset: single-centos-8-node
|
||||
pre-run: playbooks/tripleo-buildimages/tmpfiles.yaml
|
||||
vars:
|
||||
tripleo_image_os: centos8
|
||||
|
||||
# CentOS 9
|
||||
- job:
|
||||
name: tripleo-build-images-base-centos-9
|
||||
abstract: true
|
||||
description: |
|
||||
Base abstract job for tripleo-buildimage-* centos-9 jobs
|
||||
parent: tripleo-ci-build-images-required-projects-upstream
|
||||
nodeset: single-centos-9-node
|
||||
pre-run: playbooks/tripleo-buildimages/tmpfiles.yaml
|
||||
vars:
|
||||
tripleo_image_os: centos9
|
||||
|
||||
# Zuul layout for TripleO Build Image jobs.
|
||||
|
||||
- project-template:
|
||||
|
Loading…
Reference in New Issue
Block a user