From 1c40f8ae576b44e1e01471c78796c53120e69800 Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <dtantsur@protonmail.com>
Date: Tue, 10 May 2022 12:12:33 +0200
Subject: [PATCH] Fix the CI

* Fix the default interfaces in the devstack plugin
* Do not default to netboot with a whole disk image
* Add missing stestr dependency, removed unused dependencies

Change-Id: I88fe1eb17acb27f18a3093367a29b5f5049d74af
---
 .zuul.yaml            |  1 -
 devstack/plugin.sh    | 15 ++++-----------
 test-requirements.txt |  6 ++----
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index e066f40..95505a2 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -14,7 +14,6 @@
       - x/ironic-staging-drivers
     vars:
       devstack_localrc:
-        IRONIC_DEFAULT_BOOT_OPTION: netboot
         IRONIC_DEFAULT_DEPLOY_INTERFACE: ""
       devstack_plugins:
         ironic-staging-drivers: https://opendev.org/x/ironic-staging-drivers
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index dabdadb..61da89d 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -28,16 +28,6 @@ function setup_ironic_enabled_interfaces_for {
     ironic_iface_var="IRONIC_ENABLED_${iface_var}_INTERFACES"
     staging_ifs=$($IRONIC_STAGING_LIST_EP_CMD -t ironic.hardware.interfaces.${iface})
 
-    # NOTE(pas-ha) need fake management interface enabled for staging-wol hw type,
-    # and even if WoL is disabled by skips or filters, no harm in enabling it any way
-    if [[ $iface == 'management' ]]; then
-        if [[ -n ${staging_ifs} ]]; then
-            staging_ifs+=",fake"
-        else
-            staging_ifs='fake'
-        fi
-    fi
-
     if [[ -n ${staging_ifs} ]]; then
         iniset $IRONIC_CONF_FILE DEFAULT "enabled_${iface}_interfaces" "${!ironic_iface_var},$staging_ifs"
     fi
@@ -63,7 +53,10 @@ function update_ironic_enabled_drivers {
     # NOTE(pas-ha) find and enable any type of ironic hardware interface
     # registered by ironic-staging-drivers package (minding skips and filters)
     for i in $IRONIC_DRIVER_INTERFACE_TYPES; do
-        setup_ironic_enabled_interfaces_for $i
+        # NOTE(dtantsur): power and management have auto-detected defaults
+        if [[ "$i" != "power" && "$i" != "management" ]]; then
+            setup_ironic_enabled_interfaces_for $i
+        fi
     done
 }
 
diff --git a/test-requirements.txt b/test-requirements.txt
index de1c963..fc4349b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,9 +3,7 @@
 # process, which may cause wedges in the gate later.
 
 coverage!=4.4,>=4.0 # Apache-2.0
-python-subunit>=1.0.0 # Apache-2.0/BSD
+# oslotest is not used explicitly but is required by the ironic tests
 oslotest>=3.2.0 # Apache-2.0
-testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
-os-testr>=1.0.0 # Apache-2.0
-
+stestr>=2.0.0 # Apache-2.0