From 56aa95b88cf4608b2eb9cc656fd37d3676cbd86b Mon Sep 17 00:00:00 2001
From: Elod Illes <elod.illes@est.tech>
Date: Thu, 9 Jul 2020 15:46:41 +0200
Subject: [PATCH] Revert "Make greande jobs n-v for EM and oldest stable"

This reverts commit 9313dce4590116b13b24570c5455df415575817e.

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: Ibd085a563b89c117e1e9a9c112a7d15cc2ecbc3e
---
 .zuul.yaml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 714c235b156..cc2f365461b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -21,10 +21,8 @@
         - neutron-rally-task
         - neutron-tempest-dvr
         - neutron-tempest-linuxbridge
-        - neutron-grenade-multinode:
-            voting: false
-        - neutron-grenade-dvr-multinode:
-            voting: false
+        - neutron-grenade-multinode
+        - neutron-grenade-dvr-multinode
         - tempest-multinode-full-py3:
             voting: false
             # We don't run the job on things like neutron docs-only changes
@@ -40,8 +38,7 @@
               - ^tox.ini$
         - neutron-tempest-dvr-ha-multinode-full
         - neutron-tempest-iptables_hybrid
-        - neutron-grenade:
-            voting: false
+        - neutron-grenade
         - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa:
             voting: false
             irrelevant-files: *tempest-irrelevant-files
@@ -57,7 +54,6 @@
             voting: false
             irrelevant-files: *tempest-irrelevant-files
         - grenade-py3:
-            voting: false
             irrelevant-files: *tempest-irrelevant-files
         - openstacksdk-functional-devstack-networking:
             voting: false
@@ -69,12 +65,17 @@
         - neutron-tempest-dvr
         - neutron-tempest-linuxbridge
         - neutron-tempest-iptables_hybrid
+        - neutron-grenade-multinode
+        - neutron-grenade-dvr-multinode
+        - neutron-grenade
         - tempest-full:
             timeout: 10800
         - tempest-full-py3:
             timeout: 10800
         - tempest-slow-py3:
             irrelevant-files: *tempest-irrelevant-files
+        - grenade-py3:
+            irrelevant-files: *tempest-irrelevant-files
     periodic:
       jobs:
         - neutron-functional