From 42e63203978095c598e21e9a74baec20e262b416 Mon Sep 17 00:00:00 2001
From: Elod Illes <elod.illes@est.tech>
Date: Mon, 6 Jul 2020 13:10:54 +0200
Subject: [PATCH] Revert "Make greande jobs n-v for EM and oldest stable"

This reverts commit b05bf09b2d50bd77d33a31babe204ba7969f0221.

NOTE(elod.illes): devstack in Rocky is fixed and grenade jobs started
to pass. We can enable grenades again to restore testing as it was
before.

Change-Id: I2d8bbffb3f58f5d0190e970ff860162c122a9b0e
---
 .zuul.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 7a62c991e80d..961b58741138 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -253,7 +253,6 @@
             voting: false
             irrelevant-files: *dsvm-irrelevant-files
         - neutron-grenade-multinode:
-            voting: false
             irrelevant-files: *dsvm-irrelevant-files
         - neutron-tempest-linuxbridge:
             irrelevant-files:
@@ -262,8 +261,7 @@
               # code; we don't need to run this on all changes, nor do we run
               # it in the gate.
               - ^(?!nova/network/.*)(?!nova/virt/libvirt/vif.py).*$
-        - nova-grenade-live-migration:
-            voting: false
+        - nova-grenade-live-migration
         - nova-live-migration
         - nova-lvm
         - nova-next
@@ -277,10 +275,10 @@
         - tempest-slow-py3:
             irrelevant-files: *dsvm-irrelevant-files
         - grenade-py3:
-            voting: false
             irrelevant-files: *dsvm-irrelevant-files
     gate:
       jobs:
+        - nova-grenade-live-migration
         - nova-live-migration
         - nova-tox-functional
         - nova-tox-functional-py35
@@ -289,6 +287,8 @@
             irrelevant-files: *dsvm-irrelevant-files
         - tempest-slow-py3:
             irrelevant-files: *dsvm-irrelevant-files
+        - grenade-py3:
+            irrelevant-files: *dsvm-irrelevant-files
     experimental:
       jobs:
         - ironic-tempest-bfv: