From de57799490f57f8757664e7523daebc2c517023c Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Wed, 5 Sep 2018 08:41:24 +0200
Subject: [PATCH] Update zuul/projects.yaml

Remove all branch specifiers, the project has zuul.d backported and
branch specifiers are not needed.

Use new template for lower-constraints jobs.

Remove queue name from experimental queue, this is not needed.

Change-Id: I80e9a8efcc163e389c8d114063921e43a4b48039
---
 zuul.d/projects.yaml | 29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 363b7b005d..39c41baaaf 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -4,6 +4,7 @@
     templates:
       - check-requirements
       - periodic-stable-jobs-neutron
+      - openstack-lower-constraints-jobs
       - openstack-python-jobs
       - openstack-python35-jobs
       - openstack-python36-jobs
@@ -12,14 +13,11 @@
     check:
       jobs:
         - neutron-lbaasv2-dsvm-api
-        - neutron-lbaasv2-dsvm-py3x-api:
-            branches: ^(?!stable/ocata).*$
+        - neutron-lbaasv2-dsvm-py3x-api
         - neutron-lbaasv2-dsvm-scenario:
             voting: false
         - neutron-lbaasv2-dsvm-py3x-scenario:
-            branches: ^(?!stable/ocata).*$
             voting: false
-        - openstack-tox-lower-constraints
         - openstack-tox-functional:
             irrelevant-files:
               - ^.*\.rst$
@@ -28,7 +26,6 @@
               - ^etc/.*$
               - ^releasenotes/.*$
         - openstack-tox-functional-py35:
-            branches: ^(?!stable/ocata).*$
             irrelevant-files:
               - ^.*\.rst$
               - ^api-ref/.*$
@@ -36,12 +33,10 @@
               - ^etc/.*$
               - ^releasenotes/.*$
         - octavia-v1-dsvm-scenario
-        - octavia-v1-dsvm-py3x-scenario:
-            branches: ^(?!stable/ocata).*$
+        - octavia-v1-dsvm-py3x-scenario
         - octavia-v1-dsvm-scenario-multinode:
             voting: false
         - octavia-v1-dsvm-py3x-scenario-multinode:
-            branches: ^(?!stable/ocata).*$
             voting: false
         - octavia-v1-dsvm-scenario-kvm-centos.7:
             voting: false
@@ -49,14 +44,11 @@
             voting: false
         - octavia-v2-dsvm-noop-py35-api:
             voting: false
-            branches: ^(?!stable/ocata).*$
         - octavia-v2-dsvm-scenario:
             voting: false
         - octavia-v2-dsvm-py35-scenario:
             voting: false
-            branches: ^(?!stable/ocata).*$
         - octavia-grenade:
-            branches: ^(?!stable/(ocata|pike|queens)).*$
             irrelevant-files:
               - ^.*\.rst$
               - ^api-ref/.*$
@@ -71,7 +63,6 @@
     gate:
       queue: octavia
       jobs:
-        - openstack-tox-lower-constraints
         - openstack-tox-functional:
             irrelevant-files:
               - ^.*\.rst$
@@ -80,7 +71,6 @@
               - ^etc/.*$
               - ^releasenotes/.*$
         - openstack-tox-functional-py35:
-            branches: ^(?!stable/ocata).*$
             irrelevant-files:
               - ^.*\.rst$
               - ^api-ref/.*$
@@ -88,18 +78,14 @@
               - ^etc/.*$
               - ^releasenotes/.*$
         - octavia-v1-dsvm-scenario
-        - octavia-v1-dsvm-py3x-scenario:
-            branches: ^(?!stable/ocata).*$
+        - octavia-v1-dsvm-py3x-scenario
         - octavia-v1-dsvm-scenario-multinode:
             voting: false
         - octavia-v1-dsvm-py3x-scenario-multinode:
-            branches: ^(?!stable/ocata).*$
             voting: false
         - neutron-lbaasv2-dsvm-api
-        - neutron-lbaasv2-dsvm-py3x-api:
-            branches: ^(?!stable/ocata).*$
+        - neutron-lbaasv2-dsvm-py3x-api
         - octavia-grenade:
-            branches: ^(?!stable/(ocata|pike|queens)).*$
             irrelevant-files:
               - ^.*\.rst$
               - ^api-ref/.*$
@@ -112,14 +98,11 @@
               - ^tox.ini$
         - openstack-tox-cover
     experimental:
-      queue: octavia
       jobs:
-        - octavia-v1-dsvm-scenario-lxd:
-            branches: ^(?!stable/ocata).*$
+        - octavia-v1-dsvm-scenario-lxd
     periodic:
       jobs:
         - publish-openstack-octavia-amphora-image-ubuntu:
             branches: ^(?!stable/.*).*$
         - publish-openstack-octavia-amphora-image-centos:
             branches: ^(?!stable/.*).*$
-