From 6565c634c3001be77348e847e424cecb3bbf5e02 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Wed, 24 Jun 2020 09:58:19 -0500
Subject: [PATCH] Remove greande jobs for EM and oldest stable

As discussed in ML thread[1], we are going to
make grenade jobs as non voting for all EM stable and
oldest stable. grenade jobs are failing not and it might take
time to fix those if we are able to fix. Once it jobs are
working depends on project team, they can bring them back to
voting or keep non-voting.

With n-v jobs on projects side we need to udpate the integrated
gate template to remove the job from gate pipeline.

Needed-By: https://review.opendev.org/#/c/737414/1
Needed-BY: https://review.opendev.org/#/c/737332/
Needed-By: https://review.opendev.org/#/c/737408/
[1] http://lists.openstack.org/pipermail/openstack-discuss/2020-June/015499.html

Change-Id: I0a924cb298bd74034a9b33d31d2fd506391ac16d
---
 zuul.d/project-templates.yaml             | 14 ++++++++++++--
 zuul.d/zuul-legacy-project-templates.yaml | 12 ++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index 73ffa95c..d0f57b32 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -1871,12 +1871,22 @@
       repositories in the integrated gate.
     check:
       jobs:
-        - grenade
+        - grenade:
+            # NOTE(gmann): Do not run the grenade job for
+            # Extended Maintainance or oldest stable branch.
+            # We need to upate this list when any stable
+            # is moved to Extended Maintainance state.
+            branches: ^(?!(stable/(ocata|pike|queens|rocky|stein))).*$
         - tempest-full-py3:
             branches: ^(?!(stable/(newton|ocata|pike)|driverfixes)).*$
     gate:
       jobs:
-        - grenade
+        - grenade:
+            # NOTE(gmann): Do not run the grenade job for
+            # Extended Maintainance or oldest stable branch.
+            # We need to upate this list when any stable
+            # is moved to Extended Maintainance state.
+            branches: ^(?!(stable/(ocata|pike|queens|rocky|stein))).*$
         - tempest-full-py3:
             branches: ^(?!(stable/(newton|ocata|pike)|driverfixes)).*$
 
diff --git a/zuul.d/zuul-legacy-project-templates.yaml b/zuul.d/zuul-legacy-project-templates.yaml
index 613d2b87..c07fb461 100644
--- a/zuul.d/zuul-legacy-project-templates.yaml
+++ b/zuul.d/zuul-legacy-project-templates.yaml
@@ -18,14 +18,22 @@
             branches: ^stable/(newton|ocata)$
         - tempest-full
         - neutron-grenade:
-            branches: ^stable/(pike|queens|rocky|stein|train).*$
+            # NOTE(gmann): Do not run the grenade job for
+            # Extended Maintainance or oldest stable branch.
+            # Now this is only needed for stable/train as
+            # stable/ussuri onwards we use integrated-gate-py3.
+            branches: stable/train
     gate:
       jobs:
         - legacy-tempest-dsvm-neutron-full:
             branches: ^stable/(newton|ocata)$
         - tempest-full
         - neutron-grenade:
-            branches: ^stable/(pike|queens|rocky|stein|train).*$
+            # NOTE(gmann): Do not run the grenade job for
+            # Extended Maintainance or oldest stable branch.
+            # Now this is only needed for stable/train as
+            # stable/ussuri onwards we use integrated-gate-py3.
+            branches: stable/train
 
 - project-template:
     name: puppet-module-unit-jobs