Merge "Fix image format set for rally test cases"

[functest.git] / ci / prepare_env.py

diff --git a/ci/prepare_env.py b/ci/prepare_env.py
index b8c536f..49dcdd5 100755 (executable)
--- a/ci/prepare_env.py
+++ b/ci/prepare_env.py
@@ -13,18 +13,18 @@
 #
 
 
-import argparse
+import json
 import os
 import re
 import subprocess
 import sys
-import json
 
+import argparse
 import functest.utils.functest_logger as ft_logger
 import functest.utils.functest_utils as ft_utils
 import functest.utils.openstack_utils as os_utils
 import yaml
-
+from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO
 
 actions = ['start', 'check']
 parser = argparse.ArgumentParser()
@@ -44,8 +44,6 @@ CI_INSTALLER_TYPE = ""
 CI_INSTALLER_IP = ""
 CI_SCENARIO = ""
 CI_DEBUG = False
-REPOS_DIR = os.getenv('repos_dir')
-FUNCTEST_REPO = REPOS_DIR + '/functest/'
 CONFIG_FUNCTEST_PATH = os.environ["CONFIG_FUNCTEST_YAML"]
 CONFIG_PATCH_PATH = os.path.join(os.path.dirname(
     CONFIG_FUNCTEST_PATH), "config_patch.yaml")
@@ -224,7 +222,7 @@ def install_rally():
     logger.info("Creating Rally environment...")
 
     cmd = "rally deployment destroy opnfv-rally"
-    ft_utils.execute_command(cmd, logger=logger, exit_on_error=False,
+    ft_utils.execute_command(cmd, exit_on_error=False,
                              error_msg=("Deployment %s does not exist."
                                         % DEPLOYMENT_MAME), verbose=False)
     rally_conf = os_utils.get_credentials_for_rally()
@@ -232,27 +230,27 @@ def install_rally():
         json.dump(rally_conf, fp)
     cmd = "rally deployment create --file=rally_conf.json --name="
     cmd += DEPLOYMENT_MAME
-    ft_utils.execute_command(cmd, logger,
+    ft_utils.execute_command(cmd,
                              error_msg="Problem creating Rally deployment")
 
     logger.info("Installing tempest from existing repo...")
     cmd = ("rally verify install --source " + TEMPEST_REPO_DIR +
            " --system-wide")
-    ft_utils.execute_command(cmd, logger,
+    ft_utils.execute_command(cmd,
                              error_msg="Problem installing Tempest.")
 
     cmd = "rally deployment check"
-    ft_utils.execute_command(cmd, logger,
+    ft_utils.execute_command(cmd,
                              error_msg=("OpenStack not responding or "
                                         "faulty Rally deployment."))
 
     cmd = "rally show images"
-    ft_utils.execute_command(cmd, logger,
+    ft_utils.execute_command(cmd,
                              error_msg=("Problem while listing "
                                         "OpenStack images."))
 
     cmd = "rally show flavors"
-    ft_utils.execute_command(cmd, logger,
+    ft_utils.execute_command(cmd,
                              error_msg=("Problem while showing "
                                         "OpenStack flavors."))