Browse Source

Merge "Update Zuul configuration"

tags/14.0.0.0rc1
Zuul 10 months ago
parent
commit
105e86f21a
1 changed files with 3 additions and 41 deletions
  1. 3
    41
      .zuul.yaml

+ 3
- 41
.zuul.yaml View File

@@ -1,5 +1,6 @@
1 1
 - project:
2 2
     templates:
3
+      - openstack-lower-constraints-jobs
3 4
       - openstack-python-jobs
4 5
       - openstack-python35-jobs
5 6
       - openstack-python36-jobs
@@ -17,7 +18,6 @@
17 18
             voting: false
18 19
         - nova-multiattach
19 20
         - openstack-tox-functional-py35:
20
-            branches: ^(?!driverfixes/).*$
21 21
             irrelevant-files:
22 22
               - ^.*\.rst$
23 23
               - ^api-ref/.*$
@@ -27,9 +27,7 @@
27 27
               - ^contrib/block-box.*$
28 28
               - ^doc/.*$
29 29
               - ^releasenotes/.*$
30
-        - openstack-tox-lower-constraints
31
-        - cinder-tox-functional-py36
32
-        - cinder-tox-py36
30
+        - openstack-tox-functional-py36
33 31
         - cinder-rally-task:
34 32
             voting: false
35 33
         - openstack-tox-pylint:
@@ -154,7 +152,6 @@
154 152
         - cinder-tox-compliance
155 153
         - nova-multiattach
156 154
         - openstack-tox-functional-py35:
157
-            branches: ^(?!driverfixes/).*$
158 155
             irrelevant-files:
159 156
               - ^.*\.rst$
160 157
               - ^api-ref/.*$
@@ -164,8 +161,6 @@
164 161
               - ^contrib/block-box.*$
165 162
               - ^doc/.*$
166 163
               - ^releasenotes/.*$
167
-
168
-        - openstack-tox-lower-constraints
169 164
         - legacy-grenade-dsvm-cinder-mn-sub-volbak:
170 165
             irrelevant-files:
171 166
               - ^(test-|)requirements.txt$
@@ -346,6 +341,7 @@
346 341
     post:
347 342
       jobs:
348 343
         - publish-loci-cinder
344
+
349 345
 - job:
350 346
     # Previously named legacy-tempest-dsvm-full-lio
351 347
     name: cinder-tempest-dsvm-lvm-lio-barbican
@@ -408,40 +404,6 @@
408 404
       - ^releasenotes/.*$
409 405
       - ^setup.cfg$
410 406
       - ^tools/.*$
411
-- job:
412
-    # Testing running on bionic
413
-    name: cinder-tox-functional-py36
414
-    parent: openstack-tox
415
-    nodeset: ubuntu-bionic
416
-    vars:
417
-      tox_envlist: functional-py36
418
-    irrelevant-files:
419
-      - ^.*\.rst$
420
-      - ^api-ref/.*$
421
-      - ^cinder/hacking/.*$
422
-      - ^cinder/locale/.*$
423
-      - ^cinder/tests/unit.*$
424
-      - ^contrib/block-box.*$
425
-      - ^doc/.*$
426
-      - ^releasenotes/.*$
427
-      - ^tools/.*$
428
-- job:
429
-    # Testing running on bionic
430
-    name: cinder-tox-py36
431
-    parent: openstack-tox
432
-    nodeset: ubuntu-bionic
433
-    vars:
434
-      tox_envlist: py36
435
-    irrelevant-files:
436
-      - ^.*\.rst$
437
-      - ^api-ref/.*$
438
-      - ^cinder/hacking/.*$
439
-      - ^cinder/locale/.*$
440
-      - ^cinder/tests/functional.*$
441
-      - ^contrib/block-box.*$
442
-      - ^doc/.*$
443
-      - ^releasenotes/.*$
444
-      - ^tools/.*$
445 407
 
446 408
 - job:
447 409
     name: cinder-rally-task

Loading…
Cancel
Save