Merge "CI: Remove redundant set/unset_cirros_image_q35_machine_type"
This commit is contained in:
commit
428acfe97f
@ -237,10 +237,6 @@ function test_instance_boot {
|
||||
local upgrade_instance_name="kolla_upgrade_test${machine_type:+_$machine_type}"
|
||||
local volume_name="durable_volume${machine_type:+_$machine_type}"
|
||||
|
||||
if [[ $machine_type == "q35" ]]; then
|
||||
set_cirros_image_q35_machine_type
|
||||
fi
|
||||
|
||||
echo "TESTING: Server creation"
|
||||
create_instance kolla_boot_test
|
||||
echo "SUCCESS: Server creation"
|
||||
@ -352,10 +348,6 @@ function test_instance_boot {
|
||||
|
||||
echo "SUCCESS: Instance (Nova and Neutron) upgrade stability (PHASE: $PHASE)"
|
||||
fi
|
||||
|
||||
if [[ $machine_type == "q35" ]]; then
|
||||
unset_cirros_image_q35_machine_type
|
||||
fi
|
||||
}
|
||||
|
||||
function test_openstack_logged {
|
||||
|
Loading…
Reference in New Issue
Block a user