remove imported FUNCTEST_REPO object

[functest.git] / cli / commands / cli_tier.py

diff --git a/cli/commands/cli_tier.py b/cli/commands/cli_tier.py
index 8e031cc..ee45d84 100644 (file)
--- a/cli/commands/cli_tier.py
+++ b/cli/commands/cli_tier.py
@@ -12,19 +12,16 @@
 import os
 
 import click
+
 import functest.ci.tier_builder as tb
 import functest.utils.functest_utils as ft_utils
-import yaml
-
 
-with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f:
-    functest_yaml = yaml.safe_load(f)
+functest_yaml = ft_utils.get_functest_yaml()
 
-REPOS_DIR = os.getenv('repos_dir')
-FUNCTEST_REPO = ("%s/functest/" % REPOS_DIR)
 FUNCTEST_CONF_DIR = functest_yaml.get("general").get(
     "directories").get("dir_functest_conf")
 ENV_FILE = FUNCTEST_CONF_DIR + "/env_active"
+FUNCTEST_REPO = ft_utils.FUNCTEST_REPO
 
 
 class CliTier:
@@ -32,7 +29,7 @@ class CliTier:
     def __init__(self):
         CI_INSTALLER_TYPE = os.getenv('INSTALLER_TYPE')
         CI_SCENARIO = os.getenv('DEPLOY_SCENARIO')
-        testcases = FUNCTEST_REPO + "/ci/testcases.yaml"
+        testcases = ft_utils.get_testcases_file()
         self.tiers = tb.TierBuilder(CI_INSTALLER_TYPE, CI_SCENARIO, testcases)
 
     def list(self):
@@ -69,9 +66,9 @@ class CliTier:
                        "Run first 'functest env prepare'")
         else:
             if noclean:
-                cmd = ("python /home/opnfv/repos/functest/ci/run_tests.py "
-                       "-n -t %s" % tiername)
+                cmd = ("python %s/ci/run_tests.py "
+                       "-n -t %s" % (FUNCTEST_REPO, tiername))
             else:
-                cmd = ("python /home/opnfv/repos/functest/ci/run_tests.py "
-                       "-t %s" % tiername)
+                cmd = ("python %s/ci/run_tests.py "
+                       "-t %s" % (FUNCTEST_REPO, tiername))
             ft_utils.execute_command(cmd)