From 1d747e8587f75a41eed354f9c440db486a0f507c Mon Sep 17 00:00:00 2001
From: Bartosz Bezak <bartosz@stackhpc.com>
Date: Wed, 13 Sep 2023 12:20:16 +0000
Subject: [PATCH] CI: Remove redundant set/unset_cirros_image_q35_machine_type
it is already in test_openstack_logged function
Change-Id: I2d092b4cf6dc6527d1c3c5e172349e480c2366d3
---
tests/test-core-openstack.sh | 8 --------
1 file changed, 8 deletions(-)
diff --git a/tests/test-core-openstack.sh b/tests/test-core-openstack.sh
index e43e2450f2..6905fc94fd 100755
--- a/tests/test-core-openstack.sh
+++ b/tests/test-core-openstack.sh
@@ -293,10 +293,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"
@@ -408,10 +404,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 {