summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-06 17:30:38 +0000
committerGerrit Code Review <review@openstack.org>2018-10-06 17:30:38 +0000
commit7b2177843ba3b84ea95d13bec5a343d1a9106580 (patch)
tree0058fd3ac049f2b0c43298449ffba9de54a4e071
parent77e75e25e383fb8319be7b46eca3d1d10136bc22 (diff)
parent58cccf098b33f3336d8ccda36c182f9d77c5611c (diff)
Merge "Use templates for cover and lower-constraints"
-rw-r--r--.zuul.yaml13
-rw-r--r--test-requirements.txt1
2 files changed, 6 insertions, 8 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 0541e40..df57d8d 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -105,23 +105,20 @@
105 105
106- project: 106- project:
107 templates: 107 templates:
108 - lib-forward-testing
109 - lib-forward-testing-python3
110 - openstack-cover-jobs
111 - openstack-lower-constraints-jobs
108 - openstack-python-jobs 112 - openstack-python-jobs
109 - openstack-python35-jobs 113 - openstack-python35-jobs
110 - openstack-python36-jobs 114 - openstack-python36-jobs
111 - lib-forward-testing
112 - lib-forward-testing-python3
113 - publish-openstack-docs-pti
114 - periodic-stable-jobs 115 - periodic-stable-jobs
116 - publish-openstack-docs-pti
115 check: 117 check:
116 jobs: 118 jobs:
117 - openstack-tox-lower-constraints
118 - pbr-installation-devstack 119 - pbr-installation-devstack
119 - pbr-installation-upstream-devstack 120 - pbr-installation-upstream-devstack
120 gate: 121 gate:
121 jobs: 122 jobs:
122 - openstack-tox-lower-constraints
123 - pbr-installation-devstack 123 - pbr-installation-devstack
124 - pbr-installation-upstream-devstack 124 - pbr-installation-upstream-devstack
125 post:
126 jobs:
127 - openstack-tox-cover
diff --git a/test-requirements.txt b/test-requirements.txt
index e7ecf83..65f627c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -11,6 +11,7 @@ testresources>=2.0.0 # Apache-2.0/BSD
11testscenarios>=0.4 # Apache-2.0/BSD 11testscenarios>=0.4 # Apache-2.0/BSD
12testtools>=2.2.0 # MIT 12testtools>=2.2.0 # MIT
13virtualenv>=14.0.6 # MIT 13virtualenv>=14.0.6 # MIT
14coverage!=4.4,>=4.0 # Apache-2.0
14 15
15# optionally exposed by distutils commands 16# optionally exposed by distutils commands
16sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD 17sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD