From e9b7acef8ef526d05f301701da4e8682834c6f70 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sat, 8 Sep 2018 16:40:14 +0200
Subject: [PATCH] Use templates for cover and lower-constraints

Use openstack-tox-cover template, this runs the cover job
in the check queue only.

Use openstack-lower-constraints-jobs template, remove the
definition of neutron-vpnaas-tox-lower-constraints, the neutron
template does this correctly.

Remove jobs that are part of the templates.

Change-Id: I7e39bc8e3348883b06a8f38a503dd5db14d20c5d
---
 .zuul.yaml | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index f04a6af23..be643f37b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,27 +1,22 @@
 - project:
     templates:
       - check-requirements
-      - periodic-stable-jobs-neutron
+      - openstack-cover-jobs-neutron
+      - openstack-lower-constraints-jobs-neutron
       - openstack-python-jobs-neutron
       - openstack-python35-jobs-neutron
+      - periodic-stable-jobs-neutron
       - publish-openstack-sphinx-docs
       - release-notes-jobs
     check:
       jobs:
         - neutron-vpnaas-dsvm-functional-sswan
         - neutron-vpnaas-tempest
-        - neutron-vpnaas-tox-lower-constraints
         - neutron-vpnaas-tempest-libreswan-centos
-        - openstack-tox-cover:
-            voting: false
-            required-projects:
-              - openstack/neutron
-
     gate:
       jobs:
         - neutron-vpnaas-dsvm-functional-sswan
         - neutron-vpnaas-tempest
-        - neutron-vpnaas-tox-lower-constraints
     experimental:
       jobs:
         - neutron-vpnaas-dsvm-rally
@@ -96,9 +91,3 @@
       - ^doc/.*$
       - ^neutron_vpnaas/tests/unit/.*$
       - ^releasenotes/.*$
-
-- job:
-    name: neutron-vpnaas-tox-lower-constraints
-    parent: openstack-tox-lower-constraints
-    required-projects:
-      - openstack/neutron