Merge "Update Zuul configuration"

1 files changed, 3 insertions, 41 deletions

diff --git a/.zuul.yaml b/.zuul.yaml
index 364fe9c..37a0dc8 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,5 +1,6 @@
 - project:
     templates:
+      - openstack-lower-constraints-jobs
       - openstack-python-jobs
       - openstack-python35-jobs
       - openstack-python36-jobs
@@ -17,7 +18,6 @@
             voting: false
         - nova-multiattach
         - openstack-tox-functional-py35:
-            branches: ^(?!driverfixes/).*$
             irrelevant-files:
               - ^.*\.rst$
               - ^api-ref/.*$
@@ -27,9 +27,7 @@
               - ^contrib/block-box.*$
               - ^doc/.*$
               - ^releasenotes/.*$
-        - openstack-tox-lower-constraints
-        - cinder-tox-functional-py36
-        - cinder-tox-py36
+        - openstack-tox-functional-py36
         - cinder-rally-task:
             voting: false
         - openstack-tox-pylint:
@@ -154,7 +152,6 @@
         - cinder-tox-compliance
         - nova-multiattach
         - openstack-tox-functional-py35:
-            branches: ^(?!driverfixes/).*$
             irrelevant-files:
               - ^.*\.rst$
               - ^api-ref/.*$
@@ -164,8 +161,6 @@
               - ^contrib/block-box.*$
               - ^doc/.*$
               - ^releasenotes/.*$
-
-        - openstack-tox-lower-constraints
         - legacy-grenade-dsvm-cinder-mn-sub-volbak:
             irrelevant-files:
               - ^(test-|)requirements.txt$
@@ -346,6 +341,7 @@
     post:
       jobs:
         - publish-loci-cinder
+
 - job:
     # Previously named legacy-tempest-dsvm-full-lio
     name: cinder-tempest-dsvm-lvm-lio-barbican
@@ -408,40 +404,6 @@
       - ^releasenotes/.*$
       - ^setup.cfg$
       - ^tools/.*$
-- job:
-    # Testing running on bionic
-    name: cinder-tox-functional-py36
-    parent: openstack-tox
-    nodeset: ubuntu-bionic
-    vars:
-      tox_envlist: functional-py36
-    irrelevant-files:
-      - ^.*\.rst$
-      - ^api-ref/.*$
-      - ^cinder/hacking/.*$
-      - ^cinder/locale/.*$
-      - ^cinder/tests/unit.*$
-      - ^contrib/block-box.*$
-      - ^doc/.*$
-      - ^releasenotes/.*$
-      - ^tools/.*$
-- job:
-    # Testing running on bionic
-    name: cinder-tox-py36
-    parent: openstack-tox
-    nodeset: ubuntu-bionic
-    vars:
-      tox_envlist: py36
-    irrelevant-files:
-      - ^.*\.rst$
-      - ^api-ref/.*$
-      - ^cinder/hacking/.*$
-      - ^cinder/locale/.*$
-      - ^cinder/tests/functional.*$
-      - ^contrib/block-box.*$
-      - ^doc/.*$
-      - ^releasenotes/.*$
-      - ^tools/.*$
 
 - job:
     name: cinder-rally-task