Func tests use fedora-heat-test-image
This runs the existing functional tests using the images built in
http://tarballs.openstack.org/heat-test-image/
This image should be a suitable alternative to
Fedora-x86_64-20-20140618-sda, with the extra benefit that it is
prepared to install the heat config agent projects during boot
so that test_server_software_config can be enabled.
This will also allow devstack to no longer load
Fedora-x86_64-20-20140618-sda onto the nodepool images which will reduce
gate resource consumption.
Change-Id: I6041b8d6e7e9422f6e220d7aef0ca38857085e4b
diff --git a/common/config.py b/common/config.py
index 7fc6a40..f07ee86 100644
--- a/common/config.py
+++ b/common/config.py
@@ -66,8 +66,8 @@
default='private',
help="Visible fixed network name "),
cfg.StrOpt('boot_config_env',
- default='heat_integrationtests/scenario/templates'
- '/boot_config_none_env.yaml',
+ default=('heat_integrationtests/scenario/templates'
+ '/boot_config_none_env.yaml'),
help="Path to environment file which defines the "
"resource type Heat::InstallConfigAgent. Needs to "
"be appropriate for the image_ref."),
diff --git a/scenario/test_server_software_config.py b/scenario/test_server_software_config.py
index 2df815b..8b614c1 100644
--- a/scenario/test_server_software_config.py
+++ b/scenario/test_server_software_config.py
@@ -77,8 +77,12 @@
sid, res, 'CREATE_COMPLETE')
except (exceptions.StackResourceBuildErrorException,
exceptions.TimeoutException) as e:
- self._log_console_output(servers=[server])
raise e
+ finally:
+ # attempt to log the server console regardless of deployments
+ # going to complete. This allows successful and failed boot
+ # logs to be compared
+ self._log_console_output(servers=[server])
# Check that stack was fully created
self._wait_for_stack_status(sid, 'CREATE_COMPLETE')