From 28ef76a1794a0ed463e5bc4bb43902c6b153227e Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Wed, 26 Mar 2014 21:29:54 +0000
Subject: [PATCH] Prepare for deletion of stable/grizzly branches

* modules/openstack_project/files/zuul/layout.yaml: Stop running
backward compatibility, bitrot and upgrade jobs against
grizzly environments. This is needed so that when the corresponding
stable branches are deleted, we won't impede development on later
branches or generate lots of failure reports.

Change-Id: Ifa2c1c248e5312698267fc24a7213afa883bb9c4
---
 .../openstack_project/files/zuul/layout.yaml  | 26 ++-----------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 9ffdc61da3..29041edd94 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -271,12 +271,6 @@ project-templates:
     gate:
       - 'gate-{name}-requirements'
 
-  - name: periodic-grizzly
-    periodic-stable:
-      - 'periodic-{name}-docs-grizzly'
-      - 'periodic-{name}-python26-grizzly'
-      - 'periodic-{name}-python27-grizzly'
-
   - name: periodic-havana
     periodic-stable:
       - 'periodic-{name}-docs-havana'
@@ -337,9 +331,9 @@ jobs:
   - name: ^(gate|check)-tempest-dsvm-cells-full$
     voting: false
   - name: ^(gate|check)-grenade-dsvm$
-    branch: ^(?!stable/grizzly).*$
+    branch: ^(?!stable/(grizzly|havana)).*$
   - name: ^(gate|check)-grenade-dsvm-neutron$
-    branch: ^(?!stable/grizzly).*$
+    branch: ^(?!stable/(grizzly|havana)).*$
     voting: false
   - name: ^(gate|check)-grenade-dsvm-partial-ncpu$
     branch: ^(?!stable/(grizzly|havana)).*$
@@ -632,7 +626,6 @@ projects:
     template:
       - name: python-jobs
       - name: openstack-server-publish-jobs
-      - name: periodic-grizzly
       - name: periodic-havana
       - name: check-requirements
     check:
@@ -661,7 +654,6 @@ projects:
     template:
       - name: python-jobs
       - name: openstack-server-publish-jobs
-      - name: periodic-grizzly
       - name: periodic-havana
       - name: check-requirements
       - name: integrated-gate
@@ -735,7 +727,6 @@ projects:
     template:
       - name: python-jobs
       - name: openstack-server-publish-jobs
-      - name: periodic-grizzly
       - name: periodic-havana
       - name: check-requirements
       - name: integrated-gate
@@ -769,7 +760,6 @@ projects:
     template:
       - name: python-jobs
       - name: openstack-server-publish-jobs
-      - name: periodic-grizzly
       - name: periodic-havana
       - name: check-requirements
       - name: integrated-gate
@@ -799,7 +789,6 @@ projects:
     template:
       - name: python-jobs
       - name: openstack-server-publish-jobs
-      - name: periodic-grizzly
       - name: periodic-havana
       - name: check-requirements
       - name: integrated-gate
@@ -852,7 +841,6 @@ projects:
     template:
       - name: python-jobs
       - name: openstack-server-publish-jobs
-      - name: periodic-grizzly
       - name: periodic-havana
       - name: check-requirements
       - name: integrated-gate
@@ -910,7 +898,6 @@ projects:
     template:
       - name: python-jobs
       - name: openstack-server-publish-jobs
-      - name: periodic-grizzly
       - name: periodic-havana
       - name: check-requirements
       - name: integrated-gate
@@ -950,7 +937,6 @@ projects:
     template:
       - name: python-jobs
       - name: openstack-server-publish-jobs
-      - name: periodic-grizzly
       - name: periodic-havana
       - name: check-requirements
       - name: integrated-gate
@@ -2231,9 +2217,6 @@ projects:
       - tempest-coverage
       - tempest-branch-tarball
     periodic-stable:
-      - periodic-tempest-dsvm-full-grizzly
-      - periodic-tempest-dsvm-neutron-grizzly
-      - periodic-tempest-dsvm-postgres-full-grizzly
       - periodic-tempest-dsvm-full-havana
       - periodic-tempest-dsvm-neutron-havana
       - periodic-tempest-dsvm-postgres-full-havana
@@ -2650,11 +2633,6 @@ projects:
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
       - check-swift-dsvm-functional
-      - check-tempest-dsvm-full-grizzly
-      - check-tempest-dsvm-neutron-grizzly
-      - check-tempest-dsvm-postgres-full-grizzly
-      - check-tempest-dsvm-cells-grizzly
-      - check-tempest-dsvm-cells-full-grizzly
       - check-tempest-dsvm-full-havana
       - check-tempest-dsvm-neutron-havana
       - check-tempest-dsvm-postgres-full-havana