From 58cccf098b33f3336d8ccda36c182f9d77c5611c Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sat, 8 Sep 2018 16:49:37 +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 jobs that are part of the templates.

Sort list of templates.

Add coverage to test-requirements, otherwise tox -e cover will fail.

Change-Id: I0eff88e5736243291d4777f642bc48c32deafa39
---
 .zuul.yaml            | 13 +++++--------
 test-requirements.txt |  1 +
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 0541e40e..df57d8d9 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -105,23 +105,20 @@
 
 - project:
     templates:
+      - lib-forward-testing
+      - lib-forward-testing-python3
+      - openstack-cover-jobs
+      - openstack-lower-constraints-jobs
       - openstack-python-jobs
       - openstack-python35-jobs
       - openstack-python36-jobs
-      - lib-forward-testing
-      - lib-forward-testing-python3
-      - publish-openstack-docs-pti
       - periodic-stable-jobs
+      - publish-openstack-docs-pti
     check:
       jobs:
-        - openstack-tox-lower-constraints
         - pbr-installation-devstack
         - pbr-installation-upstream-devstack
     gate:
       jobs:
-        - openstack-tox-lower-constraints
         - pbr-installation-devstack
         - pbr-installation-upstream-devstack
-    post:
-      jobs:
-        - openstack-tox-cover
diff --git a/test-requirements.txt b/test-requirements.txt
index e7ecf83c..65f627c1 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -11,6 +11,7 @@ testresources>=2.0.0 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
 virtualenv>=14.0.6 # MIT
+coverage!=4.4,>=4.0 # Apache-2.0
 
 # optionally exposed by distutils commands
 sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD