From fa5f7fe7bfe66a000a38dfc699a6073f905f57b6 Mon Sep 17 00:00:00 2001
From: Kaifeng Wang <kaifeng.w@gmail.com>
Date: Sat, 29 Sep 2018 17:08:44 +0800
Subject: [PATCH] Remove grenade jobs from old stable branches

As discussed and approved during the ironic wallaby midcycle, the grenade
jobs in old stable branches.
And remove lower-constraints job.

Also replace subprocess with processutils to fix the dsvm-python3 job.

Change-Id: Ibdfed9545a26e752ab7aeed2db122a368c3c06fb
(cherry picked from commit 1ef55e3603fd7bffebaf308a4ae3868de76172ce)
---
 ironic_inspector/pxe_filter/iptables.py     | 24 +++++++++------------
 ironic_inspector/test/unit/test_iptables.py |  6 +++---
 zuul.d/project.yaml                         |  4 ----
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/ironic_inspector/pxe_filter/iptables.py b/ironic_inspector/pxe_filter/iptables.py
index 90226a95b..5d302f57e 100644
--- a/ironic_inspector/pxe_filter/iptables.py
+++ b/ironic_inspector/pxe_filter/iptables.py
@@ -15,7 +15,7 @@ import contextlib
 import os
 import re
 
-from eventlet.green import subprocess
+from oslo_concurrency import processutils
 from oslo_config import cfg
 from oslo_log import log
 
@@ -68,10 +68,9 @@ class IptablesFilter(pxe_filter.BaseFilter):
         # -w flag makes iptables wait for xtables lock, but it's not supported
         # everywhere yet
         try:
-            with open(os.devnull, 'wb') as null:
-                subprocess.check_call(self.base_command + ('-w', '-h'),
-                                      stderr=null, stdout=null)
-        except subprocess.CalledProcessError:
+            cmd = self.base_command + ('-w', '-h')
+            processutils.execute(*cmd)
+        except processutils.ProcessExecutionError:
             LOG.warning('iptables does not support -w flag, please update '
                         'it to at least version 1.4.21')
         else:
@@ -151,18 +150,15 @@ class IptablesFilter(pxe_filter.BaseFilter):
         cmd = self.base_command + args
         ignore = kwargs.pop('ignore', False)
         LOG.debug('Running iptables %s', args)
-        kwargs['stderr'] = subprocess.STDOUT
         try:
-            subprocess.check_output(cmd, **kwargs)
-        except subprocess.CalledProcessError as exc:
-            decoded_output = exc.output.decode("utf-8")
-            output = decoded_output.replace('\n', '. ')
+            processutils.execute(*cmd)
+        except processutils.ProcessExecutionError as exc:
             if ignore:
-                LOG.debug('Ignoring failed iptables %(args)s: %(output)s',
-                          {'args': args, 'output': output})
+                LOG.debug('Ignoring failed iptables %(args)s: %(error)s',
+                          {'args': args, 'error': exc})
             else:
-                LOG.error('iptables %(iptables)s failed: %(exc)s',
-                          {'iptables': args, 'exc': output})
+                LOG.error('iptables %(iptables)s failed: %(error)s',
+                          {'iptables': args, 'error': exc})
                 raise
 
     def _clean_up(self, chain):
diff --git a/ironic_inspector/test/unit/test_iptables.py b/ironic_inspector/test/unit/test_iptables.py
index 9554fa564..3f6d599d3 100644
--- a/ironic_inspector/test/unit/test_iptables.py
+++ b/ironic_inspector/test/unit/test_iptables.py
@@ -37,7 +37,7 @@ class TestIptablesDriver(test_base.NodeTest):
         self.mock_fsm = self.useFixture(
             fixtures.MockPatchObject(iptables.IptablesFilter, 'fsm')).mock
         self.mock_call = self.useFixture(
-            fixtures.MockPatchObject(iptables.subprocess, 'check_call')).mock
+            fixtures.MockPatchObject(iptables.processutils, 'execute')).mock
         self.driver = iptables.IptablesFilter()
         self.mock_iptables = self.useFixture(
             fixtures.MockPatchObject(self.driver, '_iptables')).mock
@@ -73,8 +73,8 @@ class TestIptablesDriver(test_base.NodeTest):
         self.check_fsm([pxe_filter.Events.initialize])
 
     def test_init_args_old_iptables(self):
-        self.mock_call.side_effect = iptables.subprocess.CalledProcessError(
-            2, '')
+        exc = iptables.processutils.ProcessExecutionError(2, '')
+        self.mock_call.side_effect = exc
         self.driver.init_filter()
         init_expected_args = [
             ('-D', 'INPUT', '-i', 'br-ctlplane', '-p', 'udp', '--dport', '67',
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 5f3abd2a8..b18cef2ea 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -7,22 +7,18 @@
       - release-notes-jobs
     check:
       jobs:
-        - ironic-inspector-grenade-dsvm
         - ironic-inspector-tempest-dsvm-discovery
         - ironic-inspector-tempest-dsvm-python3
         - openstack-tox-functional
         - openstack-tox-functional-py35
         - ironic-tempest-dsvm-ironic-inspector
-        - openstack-tox-lower-constraints
         - openstack-tox-cover
     gate:
       queue: ironic
       jobs:
-        - ironic-inspector-grenade-dsvm
         - ironic-inspector-tempest-dsvm-discovery
         - ironic-inspector-tempest-dsvm-python3
         - openstack-tox-functional
         - openstack-tox-functional-py35
         - ironic-tempest-dsvm-ironic-inspector
-        - openstack-tox-lower-constraints
         - openstack-tox-cover