From 33cb9421a69d8e9aeac9362f64133b339495a0c1 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Tue, 8 Dec 2015 17:57:47 +0100
Subject: [PATCH] Further juno cleanup

Remove filter for stable/juno from projects that have been missed in
previous changes and which have eol'ed juno.

Also, move one misplaced comment.

Change-Id: Icc5d0ca560f2c1564291aac00100e8a226445c99
---
 zuul/layout.yaml | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index d505e2b536..9f0865a40f 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1061,11 +1061,10 @@ jobs:
     voting: false
 
   - name: gate-tempest-dsvm-multinode-full
-    branch: ^(?!stable/juno).*$
     voting: false
 
   - name: gate-tempest-dsvm-multinode-live-migration
-    branch: ^(?!stable/(juno|kilo|liberty)).*$
+    branch: ^(?!stable/(kilo|liberty)).*$
     voting: false
 
   - name: gate-tempest-dsvm-neutron-multinode-full
@@ -1330,7 +1329,7 @@ jobs:
   - name: gate-compute-api-guide
     success-pattern: http://docs-draft.openstack.org/{build.parameters[LOG_PATH]}/api-guide/build/html/
     voting: false
-    branch: ^(?!stable/(juno|kilo|liberty)).*$
+    branch: ^(?!stable/(kilo|liberty)).*$
 
   - name: ^gate-.*-js-draft
     parameter-function: set_node_options_default_trusty
@@ -1692,9 +1691,6 @@ jobs:
     branch: ^master$
     voting: false
 
-  - name: gate-tempest-dsvm-neutron-linuxbridge
-    branch: ^(?!stable/juno).*$
-
   - name: gate-trove-buildimage-mysql
     voting: false
 
@@ -1727,14 +1723,7 @@ jobs:
     files:
       - '^apidocs/.*$'
 
-  - name: gate-tempest-dsvm-full-ceph
-    branch: ^(?!stable/juno).*$
-
-  - name: gate-tempest-dsvm-full-devstack-plugin-ceph-nv
-    branch: ^(?!stable/juno).*$
-
   - name: gate-tempest-dsvm-full-lio
-    branch: ^(?!stable/juno).*$
     voting: false
 
   # Swift log publishing details
@@ -1837,7 +1826,7 @@ jobs:
     branch: ^(?!stable/kilo).*$
 
   - name: ^gate-tempest-dsvm-lxc
-    branch: ^(?!stable/(juno|kilo|liberty)).*$
+    branch: ^(?!stable/(kilo|liberty)).*$
 
   # TODO(yamamoto): Revisit when Neutron driver API become more stable.
   - name: gate-networking-ofagent-python27
@@ -1961,11 +1950,11 @@ jobs:
 
   # Saharaclient python 3.4 tests don't run on kilo or earlier
   - name: ^gate-python-saharaclient-python34$
-    branch: ^(?!stable/(?:juno|kilo)).*$
+    branch: ^(?!stable/kilo).*$
 
   # Saharaclient functional test don't run on kilo or earlier
   - name: ^gate-saharaclient-dsvm-functional$
-    branch: ^(?!stable/(?:juno|kilo)).*$
+    branch: ^(?!stable/kilo).*$
 
   # Only run the unit cross tests for cliff against master.
   - name: ^gate-cliff-tox-(openstackclient|neutronclient)-tip$
@@ -2011,10 +2000,10 @@ jobs:
 
   # Constraints Jobs
   - name: ^gate-.*-constraints$
-    branch: ^(?!stable/(?:juno|kilo)).*$
+    branch: ^(?!stable/kilo).*$
 
   - name: ^.*-tarball-constraints$
-    branch: ^(?!stable/(?:juno|kilo)).*$
+    branch: ^(?!stable/kilo).*$
 
   - name: gate-neutron-python27
     branch: ^(?:stable/kilo).*$
@@ -2051,10 +2040,10 @@ jobs:
 
   - name: ^gate-cinder-.*-constraints$
     voting: false
-  # End Constraints Jobs
 
   - name: ^gate-glance-.*-constraints$
     voting: false
+  # End Constraints Jobs
 
   - name: gate-python-fuelclient-python34
     branch: ^(?!stable/(?:6\.1|7.0)).*$