openstack
/
tripleo-ci
Code Issues Proposed changes

Merge "Calculate TOCI_JOBTYPE from individual variables"

This commit is contained in:
Zuul 2018-08-14 19:40:27 +00:00 committed by Gerrit Code Review
parent be08b40f32 fe0c5f5f64
commit 17b20609ef
4 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
playbooks/tripleo-ci/run-v3.yaml
View File

@ -67,7 +67,11 @@
cmd: |
set -e
set -x
export TOCI_JOBTYPE={{ toci_jobtype }}
{% if nodes is defined %}
export TOCI_JOBTYPE={{ environment_type }}-{{ nodes }}-featureset{{ featureset }}
{% else %}
export TOCI_JOBTYPE={{ environment_type }}-featureset{{ featureset }}
{% endif %}
# ZUUL does not set these for periodic jobs
export ZUUL_BRANCH=${ZUUL_BRANCH:-master}

23
zuul.d/multinode-jobs.yaml
View File

@ -100,7 +100,6 @@
nodeset: three-centos-7-nodes
branches: ^(?!stable/(newton|ocata|pike)).*$
vars:
toci_jobtype: multinode-2ctlr-featureset032
environment_type: multinode
nodes: 2ctlr
featureset: '032'
@ -110,7 +109,6 @@
parent: tripleo-ci-base
branches: ^(?!stable/(newton|ocata)).*$
vars:
toci_jobtype: multinode-1ctlr-featureset010
environment_type: multinode
nodes: 1ctlr
featureset: '010'
@ -120,7 +118,6 @@
parent: tripleo-ci-base
branches: master
vars:
toci_jobtype: multinode-1ctlr-featureset010
branch_override: 'stable/queens'
environment_type: multinode
nodes: 1ctlr
@ -131,7 +128,6 @@
parent: tripleo-ci-base
branches: master
vars:
toci_jobtype: multinode-1ctlr-featureset010
branch_override: 'stable/pike'
environment_type: multinode
nodes: 1ctlr
@ -142,7 +138,6 @@
parent: tripleo-ci-base
branches: ^stable/(newton|ocata).*$
vars:
toci_jobtype: multinode-1ctlr-featureset004
environment_type: multinode
nodes: 1ctlr
featureset: '004'
@ -152,7 +147,6 @@
parent: tripleo-ci-base
branches: ^stable/(newton|ocata).*$
vars:
toci_jobtype: multinode-1ctlr-featureset005
environment_type: multinode
nodes: 1ctlr
featureset: '005'
@ -162,7 +156,6 @@
parent: tripleo-ci-base
branches: ^(?!stable/(newton|ocata)).*$
vars:
toci_jobtype: multinode-1ctlr-featureset016
environment_type: multinode
nodes: 1ctlr
featureset: '016'
@ -172,7 +165,6 @@
parent: tripleo-ci-base
branches: ^stable/(newton|ocata).*$
vars:
toci_jobtype: multinode-1ctlr-featureset006
environment_type: multinode
nodes: 1ctlr
featureset: '006'
@ -182,7 +174,6 @@
parent: tripleo-ci-base
branches: ^(?!stable/(newton|ocata)).*$
vars:
toci_jobtype: multinode-1ctlr-featureset017
environment_type: multinode
nodes: 1ctlr
featureset: '017'
@ -202,7 +193,6 @@
parent: tripleo-ci-base
branches: ^stable/ocata.*$
vars:
toci_jobtype: multinode-1ctlr-featureset007
environment_type: multinode
nodes: 1ctlr
featureset: '007'
@ -212,7 +202,6 @@
parent: tripleo-ci-base
branches: ^(?!stable/(newton|ocata)).*$
vars:
toci_jobtype: multinode-1ctlr-featureset018
environment_type: multinode
nodes: 1ctlr
featureset: '018'
@ -222,7 +211,6 @@
parent: tripleo-ci-base
branches: ^stable/ocata.*$
vars:
toci_jobtype: multinode-1ctlr-featureset008
environment_type: multinode
nodes: 1ctlr
featureset: '008'
@ -232,7 +220,6 @@
parent: tripleo-ci-base
branches: ^(?!stable/(newton|ocata)).*$
vars:
toci_jobtype: multinode-1ctlr-featureset019
environment_type: multinode
nodes: 1ctlr
featureset: '019'
@ -243,7 +230,6 @@
voting: false
branches: ^(?!stable/(newton|ocata)).*$
vars:
toci_jobtype: multinode-1ctlr-featureset026
environment_type: multinode
nodes: 1ctlr
featureset: '026'
@ -253,7 +239,6 @@
parent: tripleo-ci-base
branches: ^stable/pike.*$
vars:
toci_jobtype: multinode-1ctlr-featureset028
environment_type: multinode
nodes: 1ctlr
featureset: '028'
@ -263,7 +248,6 @@
parent: tripleo-ci-base
branches: ^(?!stable/(newton|ocata|pike)).*$
vars:
toci_jobtype: multinode-1ctlr-featureset030
environment_type: multinode
nodes: 1ctlr
featureset: '030'
@ -274,7 +258,6 @@
voting: false
branches: ^(?!stable/(newton|ocata|pike)).*$
vars:
toci_jobtype: multinode-1ctlr-featureset031
environment_type: multinode
nodes: 1ctlr
featureset: '031'
@ -285,7 +268,6 @@
voting: false
branches: ^(?!stable/(newton|ocata|pike|queens)).*$
vars:
toci_jobtype: multinode-1ctlr-featureset031
environment_type: multinode
nodes: 1ctlr
featureset: '031'
@ -296,7 +278,6 @@
voting: false
branches: ^(?!stable/(newton|ocata)).*$
vars:
toci_jobtype: multinode-1ctlr-featureset033
environment_type: multinode
nodes: 1ctlr
featureset: '033'
@ -307,7 +288,6 @@
voting: false
branches: ^(?!stable/(newton|ocata|pike)).*$
vars:
toci_jobtype: multinode-1ctlr-featureset038
environment_type: multinode
nodes: 1ctlr
featureset: '038'
@ -320,7 +300,6 @@
voting: true
branches: ^(?!stable/(newton|ocata|pike|queens)).*$
vars:
toci_jobtype: multinode-1ctlr-featureset037
environment_type: multinode
nodes: 1ctlr
featureset: '037'
@ -334,7 +313,6 @@
voting: false
branches: ^(?!stable/(newton|ocata)).*$
vars:
toci_jobtype: multinode-1ctlr-featureset044
environment_type: multinode
nodes: 1ctlr
featureset: '044'
@ -351,7 +329,6 @@
voting: false
branches: ^(?!stable/(newton|ocata|pike)).*$
vars:
toci_jobtype: multinode-1ctlr-featureset051
environment_type: multinode
nodes: 1ctlr
featureset: '051'

1
zuul.d/standalone-jobs.yaml
View File

@ -10,6 +10,5 @@
voting: false
branches: ^(?!stable/(newton|ocata|pike|queens)).*$
vars:
toci_jobtype: standalone-featureset052
environment_type: standalone
featureset: '052'

4
zuul.d/undercloud-jobs.yaml
View File

@ -23,7 +23,6 @@
nodeset: single-centos-7-node
branches: ^(?!stable/(newton|ocata|pike|queens)).*$
vars:
toci_jobtype: singlenode-featureset027
environment_type: singlenode
featureset: '027'
@ -32,7 +31,6 @@
parent: tripleo-ci-base
nodeset: single-centos-7-node
vars:
toci_jobtype: singlenode-featureset003
environment_type: singlenode
featureset: '003'
@ -42,7 +40,6 @@
nodeset: single-centos-7-node
branches: ^(?!stable/(newton|ocata)).*$
vars:
toci_jobtype: singlenode-featureset047
environment_type: singlenode
featureset: '047'
@ -53,6 +50,5 @@
nodeset: single-centos-7-node
branches: ^(?!stable/(newton|ocata|pike|queens)).*$
vars:
toci_jobtype: singlenode-featureset050
environment_type: singlenode
featureset: '050'