Browse Source

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)
changes/29/740529/1
Iury Gregory Melo Ferreira 4 months ago
parent
commit
0c1be7f6dc
2 changed files with 9 additions and 2 deletions
  1. +3
    -0
      devstack/lib/ironic
  2. +6
    -2
      zuul.d/ironic-jobs.yaml

+ 3
- 0
devstack/lib/ironic View File

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

if is_service_enabled nova; then
local bm_flavor_id


+ 6
- 2
zuul.d/ironic-jobs.yaml View File

@@ -140,6 +140,7 @@
devstack_localrc:
IRONIC_DEPLOY_DRIVER: redfish
IRONIC_ENABLED_HARDWARE_TYPES: redfish
IRONIC_VM_COUNT: 2

- job:
name: ironic-tempest-pxe_ipmitool-postgres
@@ -155,7 +156,7 @@

- job:
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
timeout: 5400
vars:
@@ -163,6 +164,7 @@
IRONIC_DEFAULT_DEPLOY_INTERFACE: direct
IRONIC_DEFAULT_RESCUE_INTERFACE: agent
IRONIC_ENABLED_RESCUE_INTERFACES: "fake,agent,no-rescue"
IRONIC_VM_COUNT: 2
IRONIC_TEMPEST_WHOLE_DISK_IMAGE: True
IRONIC_VM_EPHEMERAL_DISK: 0
SWIFT_ENABLE_TEMPURLS: True
@@ -199,12 +201,14 @@

- job:
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
timeout: 5400
vars:
devstack_localrc:
USE_PYTHON3: True
IRONIC_VM_COUNT: 2
IRONIC_AUTOMATED_CLEAN_ENABLED: True

- job:
name: ironic-tempest-bfv


Loading…
Cancel
Save