Use minimal image wherever possible
This changes most of the tests to use minimal image. There are
now two tests left that use fedora image.
[1] SoftwareConfigIntegrationTest.test_server_software_config
[2] CfnInitIntegrationTest.test_server_cfn_init
Out of which [1] is already disabled at the gate.
Change-Id: I309989de1e5584f3e345213c4b62893159365973
Related-Bug: #1628302
diff --git a/scenario/scenario_base.py b/scenario/scenario_base.py
index df86e9e..c48d64d 100644
--- a/scenario/scenario_base.py
+++ b/scenario/scenario_base.py
@@ -28,11 +28,6 @@
raise self.skipException("No default network configured to test")
self.net = self._get_network()
- if not self.conf.image_ref:
- raise self.skipException("No image configured to test")
- if not self.conf.instance_type:
- raise self.skipException("No flavor configured to test")
-
if not self.conf.minimal_image_ref:
raise self.skipException("No minimal image configured to test")
if not self.conf.minimal_instance_type:
diff --git a/scenario/test_server_cfn_init.py b/scenario/test_server_cfn_init.py
index 7ed6082..c7d84e3 100644
--- a/scenario/test_server_cfn_init.py
+++ b/scenario/test_server_cfn_init.py
@@ -21,6 +21,10 @@
def setUp(self):
super(CfnInitIntegrationTest, self).setUp()
+ if not self.conf.image_ref:
+ raise self.skipException("No image configured to test")
+ if not self.conf.instance_type:
+ raise self.skipException("No flavor configured to test")
def check_stack(self, sid):
# Check status of all resources
diff --git a/scenario/test_server_signal.py b/scenario/test_server_signal.py
index de42f02..4567e43 100644
--- a/scenario/test_server_signal.py
+++ b/scenario/test_server_signal.py
@@ -24,8 +24,8 @@
"""Check a server in a created network can signal to heat."""
parameters = {
'key_name': self.keypair_name,
- 'flavor': self.conf.instance_type,
- 'image': self.conf.image_ref,
+ 'flavor': self.conf.minimal_instance_type,
+ 'image': self.conf.minimal_image_ref,
'timeout': self.conf.build_timeout,
}
diff --git a/scenario/test_server_software_config.py b/scenario/test_server_software_config.py
index ec12fda..df35042 100644
--- a/scenario/test_server_software_config.py
+++ b/scenario/test_server_software_config.py
@@ -42,6 +42,13 @@
class SoftwareConfigIntegrationTest(scenario_base.ScenarioTestsBase):
+ def setUp(self):
+ super(SoftwareConfigIntegrationTest, self).setUp()
+ if not self.conf.image_ref:
+ raise self.skipException("No image configured to test")
+ if not self.conf.instance_type:
+ raise self.skipException("No flavor configured to test")
+
def check_stack(self):
sid = self.stack_identifier
# Check that all stack resources were created