Merge "Remove juno branch handling for manila-swift"

zuul/layout.yaml

@@ -915,7 +915,7 @@ jobs:
     voting: false
 
   - name: gate-requirements-tox-validate
-    branch: ^(?!stable/(juno|kilo)).*$
+    branch: ^(?!stable/kilo).*$
 
   - name: gate-tempest-dsvm-full
     queue-name: integrated
@@ -976,7 +976,7 @@ jobs:
     voting: false
 
   - name: gate-neutron-dsvm-functional-py34
-    branch: ^(?!stable/(juno|kilo|liberty)).*$
+    branch: ^(?!stable/(kilo|liberty)).*$
     voting: false
 
     # BUG #1290562 pypy does not work with new setuptools, so is breaking
@@ -1070,19 +1070,17 @@ jobs:
     voting: false
 
   - name: gate-tempest-dsvm-neutron-multinode-full
-    branch: ^(?!stable/juno).*$
     voting: false
 
   - name: gate-tempest-dsvm-neutron-dvr-multinode-full
-    branch: ^(?!stable/juno).*$
     voting: false
 
   - name: gate-tempest-dsvm-neutron-ovs-native
-    branch: ^(?!stable/(juno|kilo)).*$
+    branch: ^(?!stable/kilo).*$
     voting: false
 
   - name: gate-tempest-dsvm-neutron-dvr-ovs-native
-    branch: ^(?!stable/(juno|kilo)).*$
+    branch: ^(?!stable/kilo).*$
     voting: false
 
   - name: gate-networking-midonet-python34
@@ -1126,41 +1124,38 @@ jobs:
     voting: false
 
   - name: ^gate-neutron-fwaas-python34$
-    branch: ^(?!stable/(?:juno|kilo)).*$
+    branch: ^(?!stable/kilo).*$
 
   - name: ^gate-neutron-lbaasv1-dsvm-api$
-    branch: ^(?!stable/(?:juno|kilo)).*$
+    branch: ^(?!stable/kilo).*$
 
   - name: ^gate-neutron-lbaasv2-dsvm-minimal$
-    branch: ^(?!stable/(?:juno|kilo)).*$
+    branch: ^(?!stable/kilo).*$
 
   - name: ^gate-neutron-lbaasv2-dsvm-healthmonitor$
-    branch: ^(?!stable/(?:juno|kilo)).*$
+    branch: ^(?!stable/kilo).*$
 
   - name: ^gate-neutron-lbaasv2-dsvm-listener$
-    branch: ^(?!stable/(?:juno|kilo)).*$
+    branch: ^(?!stable/kilo).*$
 
   - name: ^gate-neutron-lbaasv2-dsvm-loadbalancer$
-    branch: ^(?!stable/(?:juno|kilo)).*$
+    branch: ^(?!stable/kilo).*$
 
   - name: ^gate-neutron-lbaasv2-dsvm-member$
-    branch: ^(?!stable/(?:juno|kilo)).*$
+    branch: ^(?!stable/kilo).*$
 
   - name: ^gate-neutron-lbaasv2-dsvm-pool$
-    branch: ^(?!stable/(?:juno|kilo)).*$
+    branch: ^(?!stable/kilo).*$
 
   - name: ^gate-neutron-lbaasv2-dsvm-scenario$
-    branch: ^(?!stable/(?:juno|kilo)).*$
+    branch: ^(?!stable/kilo).*$
     voting: false
 
   - name: ^gate-neutron-lbaas-python34$
-    branch: ^(?!stable/(?:juno|kilo)).*$
+    branch: ^(?!stable/kilo).*$
 
   - name: ^gate-neutron-vpnaas-python34$
-    branch: ^(?!stable/(?:juno|kilo)).*$
-
-  - name: ^gate-neutron-vpnaas-dsvm-functional-sswan$
-    branch: ^(?!stable/juno).*$
+    branch: ^(?!stable/kilo).*$
 
   - name: ^gate-group-based-policy-dsvm-functional$
     voting: false
@@ -1176,18 +1171,12 @@ jobs:
     branch: ^openstack/(?!2\.4).*$
 
   - name: ^gate-tempest-dsvm-neutron-src-.*-liberty$
-    branch: ^(?!stable/(?:juno|kilo|liberty)).*$
+    branch: ^(?!stable/(?:kilo|liberty)).*$
     voting: false
 
-  - name: gate-oslo.messaging-dsvm-functional-rabbit
-    branch: ^(?!stable/juno).*$
-
   - name: gate-oslo.messaging-dsvm-functional-qpid
     branch: ^stable/(kilo|liberty)$
 
-  - name: gate-oslo.messaging-dsvm-functional-amqp1-centos7
-    branch: ^(?!stable/juno).*$
-
   #TODO(dims): When feature/pika merges to oslo.messaging master
   #then we should run this job against master
   - name: gate-oslo.messaging-dsvm-functional-pika
@@ -1195,7 +1184,7 @@ jobs:
     voting: false
 
   - name: gate-oslo.messaging-dsvm-functional-zeromq
-    branch: ^(?!stable/(?:juno|kilo|liberty)).*$
+    branch: ^(?!stable/(?:kilo|liberty)).*$
 
   - name: gate-rally-dsvm-cinder
     voting: false
@@ -1562,25 +1551,22 @@ jobs:
     branch: ^(?!stable/kilo).*$
 
   - name: gate-oslo.db-tox-mysql-python
-    branch: ^(?!stable/(?:juno|kilo)).*$
-
-  - name: gate-oslo.db-python34
-    branch: ^(?!stable/(?:juno)).*$
+    branch: ^(?!stable/kilo).*$
 
   - name: gate-oslo.vmware-python34
-    branch: ^(?!stable/(?:juno|kilo)).*$
+    branch: ^(?!stable/kilo).*$
 
   - name: gate-oslo.messaging-python34
-    branch: ^(?!stable/(?:juno|kilo)).*$
+    branch: ^(?!stable/kilo).*$
     # TODO(dhellmann): Remove this when bug 1367907 is fixed and
     # Ubuntu's version of python no longer dumps core on us.
     voting: false
 
   - name: gate-oslo.rootwrap-python34
-    branch: ^(?!stable/(?:juno|kilo)).*$
+    branch: ^(?!stable/kilo).*$
 
   - name: gate-oslo.vmware-tox-bandit
-    branch: ^(?!stable/(juno|kilo)).*$
+    branch: ^(?!stable/kilo).*$
     voting: false
 
   - name: gate-solum-infra-guestagent-python34
@@ -1620,18 +1606,15 @@ jobs:
     voting: false
 
   - name: gate-manila-python34
-    branch: ^(?!stable/(juno|kilo)).*$
+    branch: ^(?!stable/kilo).*$
 
   - name: gate-manila-tempest-dsvm-neutron-postgres
-    branch: ^(?!stable/juno).*$
     voting: false
 
   - name: gate-manila-tempest-dsvm-neutron-no-share-servers-multibackend
-    branch: ^(?!stable/juno).*$
     voting: false
 
   - name: gate-manila-tempest-dsvm-neutron-scenario-multibackend
-    branch: ^(?!stable/juno).*$
     voting: false
 
   - name: gate-manila-tempest-dsvm-glusterfs
@@ -1645,7 +1628,7 @@ jobs:
     voting: false
 
   - name: gate-oslo.messaging-src-dsvm-full-amqp1-centos7
-    branch: ^(?!stable/(?:juno|kilo|liberty)).*$
+    branch: ^(?!stable/(?:kilo|liberty)).*$
     voting: false
 
   - name: gate-tempest-dsvm-full-zmq
@@ -1653,7 +1636,7 @@ jobs:
     voting: false
 
   - name: gate-oslo.messaging-src-dsvm-full-zmq
-    branch: ^(?!stable/(?:juno|kilo|liberty)).*$
+    branch: ^(?!stable/(?:kilo|liberty)).*$
     voting: false
 
   #TODO(dims): When feature/pika merges to oslo.messaging master
@@ -1663,7 +1646,6 @@ jobs:
     voting: false
 
   - name: gate-manila-tempest-dsvm-hdfs
-    branch: ^(?!stable/juno).*$
     voting: false
 
   - name: gate-rally-dsvm-manila-multibackend
@@ -1690,15 +1672,12 @@ jobs:
   - name: gate-tempest-dsvm-docker-centos7
     voting: false
 
-  - name: ^gate-neutron-dsvm-api$
-    branch: ^(?!stable/juno).*$
-
   - name: gate-tempest-dsvm-neutron-dvr
-    branch: ^(?!stable/(juno|kilo)).*$
+    branch: ^(?!stable/kilo).*$
     voting: false
 
   - name: gate-neutron-dsvm-fullstack
-    branch: ^(?!stable/(juno|kilo)).*$
+    branch: ^(?!stable/kilo).*$
     voting: false
 
   - name: gate-tacker-dsvm-functional
@@ -1933,7 +1912,7 @@ jobs:
     branch: ^(?!stable/kilo).*$
 
   - name: gate-swift-python34
-    branch: ^(?!stable/(?:juno|kilo|liberty)).*$
+    branch: ^(?!stable/(?:kilo|liberty)).*$
 
   - name: gate-nova-python34
     branch: ^(?!stable/kilo).*$
@@ -2050,22 +2029,22 @@ jobs:
     branch: ^(?!stable/(?:juno|kilo)).*$
 
   - name: gate-neutron-python27
-    branch: ^(?:stable/(?:juno|kilo)).*$
+    branch: ^(?:stable/kilo).*$
 
   - name: gate-neutron-pep8
-    branch: ^(?:stable/(?:juno|kilo)).*$
+    branch: ^(?:stable/kilo).*$
 
   - name: gate-neutron-docs
-    branch: ^(?:stable/(?:juno|kilo)).*$
+    branch: ^(?:stable/kilo).*$
 
   - name: neutron-coverage
-    branch: ^(?:stable/(?:juno|kilo)).*$
+    branch: ^(?:stable/kilo).*$
 
   - name: neutron-docs
-    branch: ^(?:stable/(?:juno|kilo)).*$
+    branch: ^(?:stable/kilo).*$
 
   - name: neutron-branch-tarball
-    branch: ^(?:stable/(?:juno|kilo)).*$
+    branch: ^(?:stable/kilo).*$
 
   - name: gate-nova-python27-constraints
     voting: false