summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvitikkan <viktor.tikkanen@nokia.com>2016-08-23 10:32:24 +0300
committerMorgan Richomme <morgan.richomme@orange.com>2016-08-23 07:48:05 +0000
commita9f36b9999ebd62da1e9bfbfb40874c86de3f440 (patch)
treef962403684316ec8efd75681554e87a840152b2f
parent5eb94420253db97edf0190a290f51510cd1e2712 (diff)
Create tempest resources before generating tempest.conf
During generating tempest.conf file rally tries to download cirros image from the internet if no suitable images exist in the configuration. This change ensures that cirros image is created before generating tempest.conf file. JIRA: FUNCTEST-195 Change-Id: I9e2df8af40bd02db9b78b8b6b730b4f4168a8b2d Signed-off-by: vitikkan <viktor.tikkanen@nokia.com> (cherry picked from commit 93f4a6576d58522dfbb458f184399767ef8764aa)
-rwxr-xr-xtestcases/OpenStack/tempest/run_tempest.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py
index c143fffae..7d023f5df 100755
--- a/testcases/OpenStack/tempest/run_tempest.py
+++ b/testcases/OpenStack/tempest/run_tempest.py
@@ -423,6 +423,7 @@ def main():
os.makedirs(TEMPEST_RESULTS_DIR)
deployment_dir = ft_utils.get_deployment_dir(logger)
+ create_tempest_resources()
if "" == args.conf:
MODE = ""
@@ -430,7 +431,6 @@ def main():
else:
MODE = " --tempest-config " + args.conf
- create_tempest_resources()
generate_test_list(deployment_dir, args.mode)
apply_tempest_blacklist()