ci: fix and log errors on advanced tests disqualification
Apparently we're getting an error in some cases, but also
the base job configuration changed at some point which mooted
the purpose of some of the code. So now, only trigger the excess
code and log an error if there was a failure so it is possible to
understand the actual failure.
Change-Id: I33236532d826e3795497a51bab78d2ceba55285e
Signed-off-by: Julia Kreger <juliaashleykreger@gmail.com>
diff --git a/ironic_tempest_plugin/tests/scenario/ironic_standalone/test_advanced_ops.py b/ironic_tempest_plugin/tests/scenario/ironic_standalone/test_advanced_ops.py
index b66309b..8c38a88 100644
--- a/ironic_tempest_plugin/tests/scenario/ironic_standalone/test_advanced_ops.py
+++ b/ironic_tempest_plugin/tests/scenario/ironic_standalone/test_advanced_ops.py
@@ -10,17 +10,22 @@
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log as logging
from tempest.common import utils
from tempest import config
from tempest.lib.common.utils import data_utils
from tempest.lib import decorators
+
from ironic_tempest_plugin.tests.scenario import \
baremetal_standalone_manager as bsm
CONF = config.CONF
+LOG = logging.getLogger(__name__)
+
+
class BaremetalRedfishDHCPLessDeploy(bsm.BaremetalStandaloneScenarioTest):
api_microversion = '1.59' # Ussuri for redfish-virtual-media
@@ -100,19 +105,22 @@
# in an environment where neutron was the default network interface.
# so we must try to set it to properly ensure dhcp-less operation.
prior_prov_net = self.node['driver_info'].get('provisioning_network')
- try:
- self.client.update_node(self.node['uuid'],
- [{'path': '/network_interface',
- 'op': 'replace',
- 'value': 'neutron'}])
- self.addCleanup(self.update_node,
- self.node['uuid'],
- [{'op': 'replace',
- 'path': '/network_interface',
- 'value': 'flat'}])
- except Exception:
- raise self.skipException(
- "Ironic configuration incorrect to exercise this test.")
+ if self.node['network_interface'] != 'neutron':
+ try:
+ self.client.update_node(self.node['uuid'],
+ [{'path': '/network_interface',
+ 'op': 'replace',
+ 'value': 'neutron'}])
+ self.addCleanup(self.update_node,
+ self.node['uuid'],
+ [{'op': 'replace',
+ 'path': '/network_interface',
+ 'value': 'flat'}])
+ except Exception as e:
+ LOG.debug('Encountered error attempting to set the '
+ 'network_interface to neutron. Error: %s', e)
+ raise self.skipException(
+ "Ironic configuration incorrect to exercise this test.")
ip_version = CONF.validation.ip_version_for_ssh
tenant_cidr = '10.0.6.0/24'
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index c89b63e..4849f56 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -16,6 +16,7 @@
- ironic-standalone-redfish
- ironic-standalone-redfish-2025.2
- ironic-standalone-redfish-2025.1
+ - ironic-tempest-standalone-advanced
# NOTE(dtantsur): these jobs cover rarely changed tests and are quite
# unstable, so keep them non-voting.
- ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode: