From 152fc0d6d8a3cd7c7482c48a87f72b38047b4a98 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Sun, 30 Sep 2018 11:41:11 +0200 Subject: [PATCH] Cleanup .zuul.yaml Small cleanups: * Use openstack-lower-constraints-jobs template, remove individual jobs. * Sort list of templates * Remove all branch conditions, those are implicit already here. Change-Id: I87a7b647a0d619270f171589efc425ab049f6e5d --- .zuul.yaml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index c1246f639..ca1dcbb98 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,9 +1,10 @@ - project: templates: + - check-requirements + - openstack-lower-constraints-jobs - openstack-python-jobs - openstack-python35-jobs - openstack-python36-jobs - - check-requirements - publish-openstack-docs-pti - release-notes-jobs-python3 check: @@ -11,13 +12,9 @@ - vitrage-dsvm-api-py27 - vitrage-dsvm-datasources-py27 - vitrage-dsvm-mock-py27 - - vitrage-dsvm-api-py35: - branches: ^(?!stable/(newton|ocata|pike)).*$ - - vitrage-dsvm-datasources-py35: - branches: ^(?!stable/(newton|ocata|pike)).*$ - - vitrage-dsvm-mock-py35: - branches: ^(?!stable/(newton|ocata|pike)).*$ - - openstack-tox-lower-constraints + - vitrage-dsvm-api-py35 + - vitrage-dsvm-datasources-py35 + - vitrage-dsvm-mock-py35 - grenade-vitrage gate: queue: vitrage @@ -26,8 +23,8 @@ - vitrage-dsvm-datasources-py27 - vitrage-dsvm-api-py35 - vitrage-dsvm-datasources-py35 - - openstack-tox-lower-constraints - grenade-vitrage + - job: name: vitrage-dsvm-api-py27 parent: legacy-dsvm-base