add tempest boot_mode config

This patches update the devstack to automatically
set the new tempest configuration `boot_mode`,
it will use the value from IRONIC_BOOT_MODE variable.

Increase the number of VM's in ironic-tempest-ipa-partition-pxe_ipmitool,
ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa and
ironic-tempest-ipa-partition-redfish-tinyipa
to 2 since it runs cleanning and now we run two tempest tests.

Conflicts:
       devstack/lib/ironic
       zuul.d/ironic-jobs.yaml

Change-Id: Ic6faf73430e56e2b1ff19a72b1b03f8ef34eff5f
(cherry picked from commit ddbc4a6a09)
This commit is contained in:
Iury Gregory Melo Ferreira 2020-03-23 15:08:40 +01:00
parent ecd64ea2ca
commit 0c1be7f6dc
2 changed files with 9 additions and 2 deletions

View File

@ -2757,6 +2757,9 @@ function ironic_configure_tempest {
if [[ -n "$IRONIC_PING_TIMEOUT" ]]; then if [[ -n "$IRONIC_PING_TIMEOUT" ]]; then
iniset $TEMPEST_CONFIG validation ping_timeout $IRONIC_PING_TIMEOUT iniset $TEMPEST_CONFIG validation ping_timeout $IRONIC_PING_TIMEOUT
fi fi
if [[ -n "$IRONIC_BOOT_MODE" ]]; then
iniset $TEMPEST_CONFIG baremetal boot_mode $IRONIC_BOOT_MODE
fi
if is_service_enabled nova; then if is_service_enabled nova; then
local bm_flavor_id local bm_flavor_id

View File

@ -140,6 +140,7 @@
devstack_localrc: devstack_localrc:
IRONIC_DEPLOY_DRIVER: redfish IRONIC_DEPLOY_DRIVER: redfish
IRONIC_ENABLED_HARDWARE_TYPES: redfish IRONIC_ENABLED_HARDWARE_TYPES: redfish
IRONIC_VM_COUNT: 2
- job: - job:
name: ironic-tempest-pxe_ipmitool-postgres name: ironic-tempest-pxe_ipmitool-postgres
@ -155,7 +156,7 @@
- job: - job:
name: ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa name: ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa
description: ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa description: ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa that also tests cleaning.
parent: ironic-base parent: ironic-base
timeout: 5400 timeout: 5400
vars: vars:
@ -163,6 +164,7 @@
IRONIC_DEFAULT_DEPLOY_INTERFACE: direct IRONIC_DEFAULT_DEPLOY_INTERFACE: direct
IRONIC_DEFAULT_RESCUE_INTERFACE: agent IRONIC_DEFAULT_RESCUE_INTERFACE: agent
IRONIC_ENABLED_RESCUE_INTERFACES: "fake,agent,no-rescue" IRONIC_ENABLED_RESCUE_INTERFACES: "fake,agent,no-rescue"
IRONIC_VM_COUNT: 2
IRONIC_TEMPEST_WHOLE_DISK_IMAGE: True IRONIC_TEMPEST_WHOLE_DISK_IMAGE: True
IRONIC_VM_EPHEMERAL_DISK: 0 IRONIC_VM_EPHEMERAL_DISK: 0
SWIFT_ENABLE_TEMPURLS: True SWIFT_ENABLE_TEMPURLS: True
@ -199,12 +201,14 @@
- job: - job:
name: ironic-tempest-ipa-partition-pxe_ipmitool-tinyipa-python3 name: ironic-tempest-ipa-partition-pxe_ipmitool-tinyipa-python3
description: ironic-tempest-ipa-partition-pxe_ipmitool-tinyipa-python3 description: ironic-tempest-ipa-partition-pxe_ipmitool-tinyipa-python3 that also tests cleaning.
parent: ironic-base parent: ironic-base
timeout: 5400 timeout: 5400
vars: vars:
devstack_localrc: devstack_localrc:
USE_PYTHON3: True USE_PYTHON3: True
IRONIC_VM_COUNT: 2
IRONIC_AUTOMATED_CLEAN_ENABLED: True
- job: - job:
name: ironic-tempest-bfv name: ironic-tempest-bfv