From edd6737c683816b3ad00c3d1b36d39e23635a97c Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Mon, 21 Feb 2022 10:28:37 -0800 Subject: Fix Train CI CI for stable/train presently fails on: ./ironic/drivers/modules/drac/power.py:174:22: F821 undefined name '_' Which was used for translations, but translations are not used in the file, as such stripped away the _ method invocation. Additionally, we have some semi-random job failures due to dual jobs running. In particular we fixed this in the Ussuri branch previously in Iea06632feee59714238f3b5b144bdadb733a0c35, but this change also applies this, and comments out jobs which we know are no longer functional or able to be run due to aspects outside of our control. Change-Id: I98d0c92d17e78aa5624f969710090f668df8eb0f --- ironic/drivers/modules/drac/power.py | 6 +++--- zuul.d/ironic-jobs.yaml | 4 ++++ zuul.d/project.yaml | 6 ------ 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ironic/drivers/modules/drac/power.py b/ironic/drivers/modules/drac/power.py index 468cc64b6..e96cedab9 100644 --- a/ironic/drivers/modules/drac/power.py +++ b/ironic/drivers/modules/drac/power.py @@ -171,9 +171,9 @@ def _set_power_state(task, power_state, timeout=None): raise exception.DracOperationError(error=exc) if tries <= 0: - error_msg = (_('DRAC driver timed out while trying to set the power ' - 'state for node %(node_uuid)s to ' - '%(calc_power_state)s.') % + error_msg = ('DRAC driver timed out while trying to set the power ' + 'state for node %(node_uuid)s to ' + '%(calc_power_state)s.' % {'node_uuid': node.uuid, 'calc_power_state': calc_power_state}) LOG.error(error_msg) diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml index 065a03979..d6e5239b9 100644 --- a/zuul.d/ironic-jobs.yaml +++ b/zuul.d/ironic-jobs.yaml @@ -186,6 +186,7 @@ parent: ironic-base timeout: 5400 vars: + tempest_test_regex: test_baremetal_server_ops_partition_image devstack_localrc: IRONIC_ENABLED_HARDWARE_TYPES: snmp IRONIC_DEPLOY_DRIVER: snmp @@ -199,6 +200,7 @@ parent: ironic-base timeout: 5400 vars: + tempest_test_regex: test_baremetal_server_ops_partition_image devstack_localrc: IRONIC_BOOT_MODE: uefi IRONIC_VM_SPECS_RAM: 512 @@ -271,6 +273,7 @@ parent: ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa timeout: 5400 vars: + tempest_test_regex: test_baremetal_server_ops_wholedisk_image devstack_localrc: IRONIC_AGENT_IMAGE_DOWNLOAD_SOURCE: http IRONIC_AUTOMATED_CLEAN_ENABLED: False @@ -528,6 +531,7 @@ description: Ironic tempest scenario test utilizing PXE, UEFI, and Grub2 parent: ironic-base vars: + tempest_test_regex: test_baremetal_server_ops_partition_image devstack_localrc: USE_PYTHON3: True IRONIC_ENABLED_HARDWARE_TYPES: ipmi diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 1c5bbf23f..1f564f10f 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -31,12 +31,6 @@ voting: false - ironic-inspector-tempest: voting: false - - bifrost-integration-tinyipa-ubuntu-xenial: - voting: false - - metalsmith-integration-glance-localboot-centos7: - voting: false - - ironic-tempest-pxe_ipmitool-postgres: - voting: false gate: queue: ironic jobs: -- cgit v1.2.1