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
and ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa
to 2 since it runs cleanning and now we run two tempest tests.
Depends-On: https://review.opendev.org/735960
Change-Id: Ic6faf73430e56e2b1ff19a72b1b03f8ef34eff5f
(cherry picked from commit ddbc4a6a09
)
This commit is contained in:
parent
27df8e851c
commit
dc97a2aa66
|
@ -2968,6 +2968,9 @@ function ironic_configure_tempest {
|
||||||
if [[ -n "$IRONIC_IP_VERSION" ]]; then
|
if [[ -n "$IRONIC_IP_VERSION" ]]; then
|
||||||
iniset $TEMPEST_CONFIG validation ip_version_for_ssh $IRONIC_IP_VERSION
|
iniset $TEMPEST_CONFIG validation ip_version_for_ssh $IRONIC_IP_VERSION
|
||||||
fi
|
fi
|
||||||
|
if [[ -n "$IRONIC_BOOT_MODE" ]]; then
|
||||||
|
iniset $TEMPEST_CONFIG baremetal boot_mode $IRONIC_BOOT_MODE
|
||||||
|
fi
|
||||||
if [[ "$IRONIC_IP_VERSION" == "6" ]]; then
|
if [[ "$IRONIC_IP_VERSION" == "6" ]]; then
|
||||||
# No FIPs in V6 and we dynamically create networks...
|
# No FIPs in V6 and we dynamically create networks...
|
||||||
# network_for_ssh is defaulted to public
|
# network_for_ssh is defaulted to public
|
||||||
|
|
|
@ -254,12 +254,15 @@
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: ironic-tempest-ipa-partition-pxe_ipmitool
|
name: ironic-tempest-ipa-partition-pxe_ipmitool
|
||||||
description: ironic-tempest-ipa-partition-pxe_ipmitool
|
description: ironic-tempest-ipa-partition-pxe_ipmitool that also tests cleaning.
|
||||||
parent: ironic-base
|
parent: ironic-base
|
||||||
timeout: 5400
|
timeout: 5400
|
||||||
vars:
|
vars:
|
||||||
devstack_localrc:
|
devstack_localrc:
|
||||||
IRONIC_DEFAULT_BOOT_OPTION: netboot
|
IRONIC_DEFAULT_BOOT_OPTION: netboot
|
||||||
|
IRONIC_VM_COUNT: 2
|
||||||
|
IRONIC_AUTOMATED_CLEAN_ENABLED: True
|
||||||
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: ironic-tempest-bfv
|
name: ironic-tempest-bfv
|
||||||
|
@ -691,7 +694,7 @@
|
||||||
# Used by devstack/ironic/nova/neutron
|
# Used by devstack/ironic/nova/neutron
|
||||||
- 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:
|
||||||
|
@ -701,6 +704,7 @@
|
||||||
IRONIC_ENABLED_RESCUE_INTERFACES: "fake,agent,no-rescue"
|
IRONIC_ENABLED_RESCUE_INTERFACES: "fake,agent,no-rescue"
|
||||||
IRONIC_RAMDISK_TYPE: tinyipa
|
IRONIC_RAMDISK_TYPE: tinyipa
|
||||||
IRONIC_VM_SPECS_RAM: 384
|
IRONIC_VM_SPECS_RAM: 384
|
||||||
|
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
|
||||||
|
|
Loading…
Reference in New Issue