From dd2db52ac845a7fb7c63eaab3dd525abe1ff4528 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Tue, 18 Feb 2020 21:02:44 -0600
Subject: [PATCH] Stop running devstack-plugin-ceph-tempest on master

devstack-plugin-ceph-tempest is py2 job and not supposed
to run on master gate. devstack-plugin-ceph master gate already
run its py3 version devstack-plugin-ceph-tempest-py3.

We need to keep the devstack-plugin-ceph-tempest definition
for stable branches gate.

Change-Id: I6c512b29a0346db1f92de34b1dbfb56958fa2cad
---
 .zuul.yaml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 1ffab72b..2928888a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -31,7 +31,7 @@
     name: devstack-plugin-ceph-tempest
     parent: devstack-plugin-ceph-tempest-base
     description: |
-      Integration tests that runs with the ceph devstack plugin.
+      Integration tests that runs with the ceph devstack plugin and py27.
     branches:
       - stable/ocata
       - stable/pike
@@ -42,12 +42,14 @@
     name: devstack-plugin-ceph-tempest
     parent: devstack-plugin-ceph-tempest-base
     description: |
-      Integration tests that runs with the ceph devstack plugin.
+      Integration tests that runs with the ceph devstack plugin and py27.
 
       This job enable the multiattach feature enable from stein on.
 
     # This job runs with multiattach enable from stable/stein on.
-    branches: ^(?!stable/(ocata|pike|queens|rocky)).*$
+    branches:
+      - stable/stein
+      - stable/train
     vars:
       devstack_localrc:
         ENABLE_VOLUME_MULTIATTACH: true
@@ -133,11 +135,6 @@
       Runs devstack-plugin-ceph-tempest jobs.
     check:
       jobs:
-        - devstack-plugin-ceph-tempest:
-            voting: false
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
         - devstack-plugin-ceph-tempest-py3:
             voting: false
             irrelevant-files: