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
This commit is contained in:
Julia Kreger 2022-02-21 10:28:37 -08:00
parent c424f9e8f2
commit edd6737c68
3 changed files with 7 additions and 9 deletions

View File

@ -171,9 +171,9 @@ def _set_power_state(task, power_state, timeout=None):
raise exception.DracOperationError(error=exc) raise exception.DracOperationError(error=exc)
if tries <= 0: if tries <= 0:
error_msg = (_('DRAC driver timed out while trying to set the power ' error_msg = ('DRAC driver timed out while trying to set the power '
'state for node %(node_uuid)s to ' 'state for node %(node_uuid)s to '
'%(calc_power_state)s.') % '%(calc_power_state)s.' %
{'node_uuid': node.uuid, {'node_uuid': node.uuid,
'calc_power_state': calc_power_state}) 'calc_power_state': calc_power_state})
LOG.error(error_msg) LOG.error(error_msg)

View File

@ -186,6 +186,7 @@
parent: ironic-base parent: ironic-base
timeout: 5400 timeout: 5400
vars: vars:
tempest_test_regex: test_baremetal_server_ops_partition_image
devstack_localrc: devstack_localrc:
IRONIC_ENABLED_HARDWARE_TYPES: snmp IRONIC_ENABLED_HARDWARE_TYPES: snmp
IRONIC_DEPLOY_DRIVER: snmp IRONIC_DEPLOY_DRIVER: snmp
@ -199,6 +200,7 @@
parent: ironic-base parent: ironic-base
timeout: 5400 timeout: 5400
vars: vars:
tempest_test_regex: test_baremetal_server_ops_partition_image
devstack_localrc: devstack_localrc:
IRONIC_BOOT_MODE: uefi IRONIC_BOOT_MODE: uefi
IRONIC_VM_SPECS_RAM: 512 IRONIC_VM_SPECS_RAM: 512
@ -271,6 +273,7 @@
parent: ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa parent: ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa
timeout: 5400 timeout: 5400
vars: vars:
tempest_test_regex: test_baremetal_server_ops_wholedisk_image
devstack_localrc: devstack_localrc:
IRONIC_AGENT_IMAGE_DOWNLOAD_SOURCE: http IRONIC_AGENT_IMAGE_DOWNLOAD_SOURCE: http
IRONIC_AUTOMATED_CLEAN_ENABLED: False IRONIC_AUTOMATED_CLEAN_ENABLED: False
@ -528,6 +531,7 @@
description: Ironic tempest scenario test utilizing PXE, UEFI, and Grub2 description: Ironic tempest scenario test utilizing PXE, UEFI, and Grub2
parent: ironic-base parent: ironic-base
vars: vars:
tempest_test_regex: test_baremetal_server_ops_partition_image
devstack_localrc: devstack_localrc:
USE_PYTHON3: True USE_PYTHON3: True
IRONIC_ENABLED_HARDWARE_TYPES: ipmi IRONIC_ENABLED_HARDWARE_TYPES: ipmi

View File

@ -31,12 +31,6 @@
voting: false voting: false
- ironic-inspector-tempest: - ironic-inspector-tempest:
voting: false voting: false
- bifrost-integration-tinyipa-ubuntu-xenial:
voting: false
- metalsmith-integration-glance-localboot-centos7:
voting: false
- ironic-tempest-pxe_ipmitool-postgres:
voting: false
gate: gate:
queue: ironic queue: ironic
jobs: jobs: