Browse Source

Merge "Use templates for cover and lower-constraints"

Zuul 6 months ago
parent
commit
c6039cafaf
2 changed files with 14 additions and 15 deletions
  1. 7
    14
      .zuul.yaml
  2. 7
    1
      tox.ini

+ 7
- 14
.zuul.yaml View File

@@ -1,20 +1,13 @@
1 1
 - project:
2
-    check:
3
-      jobs:
4
-        - openstack-tox-lower-constraints
5
-    gate:
6
-      jobs:
7
-        - openstack-tox-lower-constraints
8 2
     templates:
9
-      - openstack-python-jobs
10
-      - publish-openstack-docs-pti
11 3
       - check-requirements
12
-      - openstack-python35-jobs
13 4
       - lib-forward-testing
14 5
       - lib-forward-testing-python3
15
-      - release-notes-jobs-python3
16
-      - periodic-stable-jobs
6
+      - openstack-cover-jobs
7
+      - openstack-lower-constraints-jobs
8
+      - openstack-python-jobs
9
+      - openstack-python35-jobs
17 10
       - openstack-python36-jobs
18
-    post:
19
-      jobs:
20
-        - openstack-tox-cover
11
+      - periodic-stable-jobs
12
+      - publish-openstack-docs-pti
13
+      - release-notes-jobs-python3

+ 7
- 1
tox.ini View File

@@ -35,7 +35,13 @@ commands = python setup.py build_sphinx
35 35
 
36 36
 [testenv:cover]
37 37
 basepython = python3
38
-commands = python setup.py test --coverage --coverage-package-name=oslo_concurrency --testr-args='{posargs}'
38
+setenv =
39
+    PYTHON=coverage run --source oslo_concurrency --parallel-mode
40
+commands =
41
+    stestr run '{posargs}'
42
+    coverage combine
43
+    coverage html -d cover
44
+    coverage xml -o cover/coverage.xml
39 45
 
40 46
 [flake8]
41 47
 show-source = True

Loading…
Cancel
Save