Add another level of parent jobs for zuul v3

Add parent jobs (based off tripleo-ci-base) for
multinode, ovb, singlenode and standlone.
This will allow child jobs to override the playbooks
and tags defined.

 - add new parent jobs: multinode, ovb, singlenode and standlone
 - reparent jobs definitions
 - remove include_vars for environment_type
 - remove playbooks/tripleo-ci/vars/environment_type

Change-Id: Ib05797303e2775284125af8fbfb875676f1eaf78
This commit is contained in:
Ronelle Landy 2018-08-17 10:23:15 -04:00 committed by Sagi Shnaidman
parent 1f06003492
commit 037f0ecf61
9 changed files with 134 additions and 123 deletions

View File

@ -33,10 +33,6 @@
name: tripleo CI jobs runner
tasks:
- name: Include environment_type vars
include_vars:
file: "environment_type/{{ environment_type }}.yaml"
- name: render toci_gate_test script
template:
src: templates/toci_gate_test.sh.j2

View File

@ -1,33 +0,0 @@
undercloud: 127.0.0.2
environment_infra: osinfra
playbooks: |
{% if featureset == '010' %}
[
"multinode.yml"
]
{% else %}
[
"quickstart.yml",
"multinode-undercloud.yml",
"multinode-overcloud-prep.yml",
"multinode-overcloud.yml",
"multinode-overcloud-update.yml",
"multinode-overcloud-upgrade.yml",
"multinode-validate.yml"
]
{% endif %}
tags:
[
"build",
"undercloud-setup",
"undercloud-scripts",
"undercloud-install",
"undercloud-post-install",
"tripleo-validations",
"overcloud-scripts",
"overcloud-prep-config",
"overcloud-prep-containers",
"overcloud-deploy",
"overcloud-post-deploy",
"overcloud-validate"
]

View File

@ -1,26 +0,0 @@
undercloud: undercloud
environment_infra: ovb
playbooks: |
{% if featureset == '001' %}
[
"baremetal-full-deploy.yml"
]
{% elif featureset == '053' %}
[
"ovb-setup.yml",
"baremetal-full-undercloud.yml",
"baremetal-full-overcloud-prep.yml",
"baremetal-full-overcloud.yml",
"baremetal-full-overcloud-validate.yml",
"browbeat-minimal.yml"
]
{% else %}
[
"ovb-setup.yml",
"baremetal-full-undercloud.yml",
"baremetal-full-overcloud-prep.yml",
"baremetal-full-overcloud.yml",
"baremetal-full-overcloud-validate.yml"
]
{% endif %}
tags: [ "all" ]

View File

@ -1,19 +0,0 @@
undercloud: 127.0.0.2
environment_infra: osinfra
playbooks:
- quickstart.yml
- multinode-undercloud.yml
- multinode-undercloud-upgrade.yml
- multinode-overcloud-prep.yml
- multinode-overcloud.yml
- multinode-overcloud-upgrade.yml
- multinode-validate.yml
tags:
[
"build",
"undercloud-setup",
"undercloud-scripts",
"undercloud-install",
"undercloud-validate",
"images"
]

View File

@ -1,10 +0,0 @@
undercloud: 127.0.0.2
environment_infra: osinfra
playbooks:
- quickstart.yml
- multinode-standalone.yml
tags:
[
"build",
"standalone"
]

View File

@ -29,7 +29,6 @@
- git.openstack.org/openstack/browbeat
pre-run:
- playbooks/nodepool-provider/pre.yaml
- playbooks/multinode-networking/pre.yaml
- playbooks/openstack-zuul-jobs/legacy/pre.yaml
- playbooks/tripleo-ci/ceph.yaml
run: playbooks/tripleo-ci/run-v3.yaml
@ -48,6 +47,99 @@
- tox.ini
- ^setup.*$
- job:
name: tripleo-ci-base-multinode
abstract: true
description: |
Base abstract job for multinode TripleO CI zuulv3 jobs
parent: tripleo-ci-base
vars:
undercloud: 127.0.0.2
environment_infra: osinfra
playbooks:
- quickstart.yml
- multinode-undercloud.yml
- multinode-overcloud-prep.yml
- multinode-overcloud.yml
- multinode-overcloud-update.yml
- multinode-overcloud-upgrade.yml
- multinode-validate.yml
tags:
- build
- undercloud-setup
- undercloud-scripts
- undercloud-install
- undercloud-post-install
- tripleo-validations
- overcloud-scripts
- overcloud-prep-config
- overcloud-prep-containers
- overcloud-deploy
- overcloud-post-deploy
- overcloud-validate
- job:
name: tripleo-ci-base-ovb
abstract: true
description: |
Base abstract job for OVB TripleO CI zuulv3 jobs
parent: tripleo-ci-base
nodeset: single-centos-7-node
vars:
undercloud: undercloud
environment_infra: ovb
playbooks:
- ovb-setup.yml
- baremetal-full-undercloud.yml
- baremetal-full-overcloud-prep.yml
- baremetal-full-overcloud.yml
- baremetal-full-overcloud-validate.yml
tags:
- all
- job:
name: tripleo-ci-base-singlenode
abstract: true
description: |
Base abstract job for singlenode TripleO CI zuulv3 jobs
parent: tripleo-ci-base
nodeset: single-centos-7-node
vars:
undercloud: 127.0.0.2
environment_infra: osinfra
playbooks:
- quickstart.yml
- multinode-undercloud.yml
- multinode-undercloud-upgrade.yml
- multinode-overcloud-prep.yml
- multinode-overcloud.yml
- multinode-overcloud-upgrade.yml
- multinode-validate.yml
tags:
- build
- undercloud-setup
- undercloud-scripts
- undercloud-install
- undercloud-validate
- images
- job:
name: tripleo-ci-base-standalone
abstract: true
description: |
Base abstract job for standalone TripleO CI zuulv3 jobs
parent: tripleo-ci-base
nodeset: single-centos-7-node
vars:
undercloud: 127.0.0.2
environment_infra: osinfra
playbooks:
- quickstart.yml
- multinode-standalone.yml
tags:
- build
- standalone
- job:
name: tripleo-ci-dsvm
description: |

View File

@ -92,7 +92,7 @@
- job:
name: tripleo-ci-centos-7-3nodes-multinode
parent: tripleo-ci-base
parent: tripleo-ci-base-multinode
voting: false
nodeset: three-centos-7-nodes
branches: ^(?!stable/(newton|ocata|pike)).*$
@ -103,16 +103,18 @@
- job:
name: tripleo-ci-centos-7-containers-multinode
parent: tripleo-ci-base
parent: tripleo-ci-base-multinode
branches: ^(?!stable/(newton|ocata)).*$
vars:
environment_type: multinode
nodes: 1ctlr
featureset: '010'
playbooks:
- multinode.yml
- job:
name: tripleo-ci-centos-7-containers-multinode-rocky
parent: tripleo-ci-base
parent: tripleo-ci-base-multinode
timeout: 10800
voting: false
branches: master
@ -122,30 +124,39 @@
environment_type: multinode
nodes: 1ctlr
featureset: '010'
playbooks:
- multinode.yml
- job:
name: tripleo-ci-centos-7-containers-multinode-queens
parent: tripleo-ci-base
parent: tripleo-ci-base-multinode
branches: master
vars:
branch_override: 'stable/queens'
environment_type: multinode
nodes: 1ctlr
featureset: '010'
playbooks:
- multinode.yml
- job:
name: tripleo-ci-centos-7-containers-multinode-pike
parent: tripleo-ci-base
parent: tripleo-ci-base-multinode
branches: master
vars:
branch_override: 'stable/pike'
environment_type: multinode
nodes: 1ctlr
featureset: '010'
playbooks:
- multinode.yml
- job:
name: tripleo-ci-centos-7-nonha-multinode-oooq
parent: tripleo-ci-base
parent: tripleo-ci-base-multinode
branches: ^stable/(newton|ocata).*$
vars:
environment_type: multinode
@ -154,7 +165,7 @@
- job:
name: tripleo-ci-centos-7-scenario001-multinode-oooq
parent: tripleo-ci-base
parent: tripleo-ci-base-multinode
branches: ^stable/(newton|ocata).*$
vars:
environment_type: multinode
@ -163,7 +174,7 @@
- job:
name: tripleo-ci-centos-7-scenario001-multinode-oooq-container
parent: tripleo-ci-base
parent: tripleo-ci-base-multinode
branches: ^(?!stable/(newton|ocata)).*$
vars:
environment_type: multinode
@ -172,7 +183,7 @@
- job:
name: tripleo-ci-centos-7-scenario002-multinode-oooq
parent: tripleo-ci-base
parent: tripleo-ci-base-multinode
branches: ^stable/(newton|ocata).*$
vars:
environment_type: multinode
@ -181,7 +192,7 @@
- job:
name: tripleo-ci-centos-7-scenario002-multinode-oooq-container
parent: tripleo-ci-base
parent: tripleo-ci-base-multinode
branches: ^(?!stable/(newton|ocata)).*$
vars:
environment_type: multinode
@ -190,7 +201,7 @@
- job:
name: tripleo-ci-centos-7-scenario002-multinode-oooq-container-refstack
parent: tripleo-ci-base
parent: tripleo-ci-base-multinode
branches: ^(?!stable/(newton)).*$
vars:
toci_jobtype: multinode-1ctlr-featureset055
@ -200,7 +211,7 @@
- job:
name: tripleo-ci-centos-7-scenario003-multinode-oooq
parent: tripleo-ci-base
parent: tripleo-ci-base-multinode
branches: ^stable/ocata.*$
vars:
environment_type: multinode
@ -209,7 +220,7 @@
- job:
name: tripleo-ci-centos-7-scenario003-multinode-oooq-container
parent: tripleo-ci-base
parent: tripleo-ci-base-multinode
branches: ^(?!stable/(newton|ocata)).*$
vars:
environment_type: multinode
@ -218,7 +229,7 @@
- job:
name: tripleo-ci-centos-7-scenario004-multinode-oooq
parent: tripleo-ci-base
parent: tripleo-ci-base-multinode
branches: ^stable/ocata.*$
vars:
environment_type: multinode
@ -227,7 +238,7 @@
- job:
name: tripleo-ci-centos-7-scenario004-multinode-oooq-container
parent: tripleo-ci-base
parent: tripleo-ci-base-multinode
branches: ^(?!stable/(newton|ocata)).*$
vars:
environment_type: multinode
@ -236,7 +247,7 @@
- job:
name: tripleo-ci-centos-7-scenario006-multinode-oooq
parent: tripleo-ci-base
parent: tripleo-ci-base-multinode
voting: false
branches: ^(?!stable/(newton|ocata)).*$
vars:
@ -246,7 +257,7 @@
- job:
name: tripleo-ci-centos-7-scenario007-multinode-oooq
parent: tripleo-ci-base
parent: tripleo-ci-base-multinode
branches: ^stable/pike.*$
vars:
environment_type: multinode
@ -255,7 +266,7 @@
- job:
name: tripleo-ci-centos-7-scenario007-multinode-oooq-container
parent: tripleo-ci-base
parent: tripleo-ci-base-multinode
voting: false
branches: ^(?!stable/(newton|ocata|pike)).*$
vars:
@ -265,7 +276,7 @@
- job:
name: tripleo-ci-centos-7-scenario008-multinode-oooq-container
parent: tripleo-ci-base
parent: tripleo-ci-base-multinode
voting: false
branches: ^(?!stable/(newton|ocata|pike)).*$
vars:
@ -275,7 +286,7 @@
- job:
name: tripleo-ci-centos-7-scenario008-multinode-oooq
parent: tripleo-ci-base
parent: tripleo-ci-base-multinode
voting: false
branches: ^(?!stable/(newton|ocata|pike|queens)).*$
vars:
@ -285,7 +296,7 @@
- job:
name: tripleo-ci-centos-7-scenario009-multinode-oooq
parent: tripleo-ci-base
parent: tripleo-ci-base-multinode
voting: false
branches: ^(?!stable/(newton|ocata)).*$
vars:
@ -295,7 +306,7 @@
- job:
name: tripleo-ci-centos-7-scenario010-multinode-oooq-container
parent: tripleo-ci-base
parent: tripleo-ci-base-multinode
voting: false
branches: ^(?!stable/(newton|ocata|pike)).*$
vars:
@ -307,7 +318,7 @@
name: tripleo-ci-centos-7-scenario000-multinode-oooq-container-updates
description: |
Basic tripleo update job, this is not an upgrade job.
parent: tripleo-ci-base
parent: tripleo-ci-base-multinode
voting: false
branches: ^(?!stable/(newton|ocata|pike|queens)).*$
vars:
@ -320,7 +331,7 @@
- job:
name: tripleo-ci-centos-7-scenario011-multinode-oooq-container
parent: tripleo-ci-base
parent: tripleo-ci-base-multinode
voting: false
branches: ^(?!stable/(newton|ocata)).*$
vars:
@ -336,7 +347,7 @@
# Launchpad bug: #1786062
- job:
name: tripleo-ci-centos-7-scenario000-multinode-oooq-container-upgrades
parent: tripleo-ci-base
parent: tripleo-ci-base-multinode
voting: false
branches: ^(?!stable/(newton|ocata|pike)).*$
vars:

View File

@ -5,7 +5,7 @@
- job:
name: tripleo-ci-centos-7-standalone
parent: tripleo-ci-base
parent: tripleo-ci-base-standalone
nodeset: single-centos-7-node
voting: false
branches: ^(?!stable/(newton|ocata|pike|queens)).*$

View File

@ -20,7 +20,7 @@
- job:
name: tripleo-ci-centos-7-undercloud-containers
parent: tripleo-ci-base
parent: tripleo-ci-base-singlenode
nodeset: single-centos-7-node
branches: ^(?!stable/(newton|ocata|pike|queens)).*$
vars:
@ -29,7 +29,7 @@
- job:
name: tripleo-ci-centos-7-undercloud-oooq
parent: tripleo-ci-base
parent: tripleo-ci-base-singlenode
nodeset: single-centos-7-node
vars:
environment_type: singlenode
@ -37,7 +37,7 @@
- job:
name: tripleo-ci-centos-7-undercloud-upgrades
parent: tripleo-ci-base
parent: tripleo-ci-base-singlenode
nodeset: single-centos-7-node
branches: ^(?!stable/(newton|ocata)).*$
vars:
@ -46,7 +46,7 @@
- job:
name: tripleo-ci-centos-7-containerized-undercloud-upgrades
parent: tripleo-ci-base
parent: tripleo-ci-base-singlenode
nodeset: single-centos-7-node
branches: ^(?!stable/(newton|ocata|pike|queens)).*$
vars: