openstack/ironic
Code Issues Proposed changes

Merge "add tempest boot_mode config"

Browse Source
This commit is contained in:
Zuul 2020-07-09 10:07:07 +00:00 committed by Gerrit Code Review
commit 3c1ab6136f
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/lib/ironic
View File

@ -2956,6 +2956,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

8
zuul.d/ironic-jobs.yaml
View File

@ -327,12 +327,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
@ -763,7 +766,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:
@ -773,6 +776,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