From 04b3d6a165f77b9e978f98b947044ae6c79a7796 Mon Sep 17 00:00:00 2001
From: Carlos Goncalves <cgoncalves@redhat.com>
Date: Fri, 19 Jun 2020 11:46:16 +0200
Subject: [PATCH] Set octavia-grenade job non-voting

A recent uWSGI release broke devstack master and stable branches. It's
becoming increasingly difficult to maintain branches in Extended
Maintenance, especially the grenade job which depends on an older
release. The OpenStack QA team has decided [1] that the best thing to do
is to only perform upgrade testing between the current source contents
of adjacent Maintained or Development status branches.

[1] http://lists.openstack.org/pipermail/openstack-discuss/2020-June/015499.html

Change-Id: Ifcb6ad47e8a69db4c059d72b240d1750a0c5ff38
---
 zuul.d/projects.yaml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 08691acdec..b239f5b8ee 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -64,6 +64,7 @@
         - octavia-v2-dsvm-py2-scenario-two-node:
             voting: false
         - octavia-grenade:
+            voting: false
             irrelevant-files:
               - ^.*\.rst$
               - ^api-ref/.*$
@@ -120,17 +121,6 @@
               - name: openstack/diskimage-builder
                 override-checkout: 2.30.0
         - octavia-v2-dsvm-py2-scenario
-        - octavia-grenade:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^api-ref/.*$
-              - ^doc/.*$
-              - ^octavia/tests/unit/.*$
-              - ^releasenotes/.*$
-              - ^setup.cfg$
-              - ^tools/.*$
-              - ^(test-|)requirements.txt$
-              - ^tox.ini$
     periodic:
       jobs:
         - publish-openstack-octavia-amphora-image-xenial: