diff options
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/commands/cli_env.py | 4 | ||||
| -rw-r--r-- | cli/commands/cli_os.py | 5 | ||||
| -rw-r--r-- | cli/commands/cli_testcase.py | 9 | ||||
| -rw-r--r-- | cli/commands/cli_tier.py | 9 |
4 files changed, 14 insertions, 13 deletions
diff --git a/cli/commands/cli_env.py b/cli/commands/cli_env.py index 9e6372d4..0f5ef2c6 100644 --- a/cli/commands/cli_env.py +++ b/cli/commands/cli_env.py @@ -12,9 +12,9 @@ import git import os import functest.utils.functest_utils as ft_utils +from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO ENV_FILE = "/home/opnfv/functest/conf/env_active" -FUNCTEST_REPO = "/home/opnfv/repos/functest/" class CliEnv: @@ -35,7 +35,7 @@ class CliEnv: else: answer = raw_input("Invalid answer. Please type [y|n]\n") - cmd = ("python /home/opnfv/repos/functest/ci/prepare_env.py start") + cmd = ("python %s/ci/prepare_env.py start" % FUNCTEST_REPO) ft_utils.execute_command(cmd) def show(self): diff --git a/cli/commands/cli_os.py b/cli/commands/cli_os.py index a3b7ad31..d38dc9e6 100644 --- a/cli/commands/cli_os.py +++ b/cli/commands/cli_os.py @@ -14,11 +14,10 @@ import click import functest.utils.functest_utils as ft_utils import functest.utils.openstack_clean as os_clean import functest.utils.openstack_snapshot as os_snapshot +from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO 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") RC_FILE = os.getenv('creds') @@ -81,7 +80,7 @@ class CliOpenStack: def check(self): self.ping_endpoint() - cmd = FUNCTEST_REPO + "ci/check_os.sh" + cmd = FUNCTEST_REPO + "/ci/check_os.sh" ft_utils.execute_command(cmd, verbose=False) def snapshot_create(self): diff --git a/cli/commands/cli_testcase.py b/cli/commands/cli_testcase.py index 498f0813..68f9ed61 100644 --- a/cli/commands/cli_testcase.py +++ b/cli/commands/cli_testcase.py @@ -15,6 +15,7 @@ import click import functest.ci.tier_builder as tb import functest.utils.functest_utils as ft_utils import functest.utils.functest_vacation as vacation +from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO functest_yaml = ft_utils.get_functest_yaml() @@ -54,9 +55,9 @@ class CliTestcase: "Run first 'functest env prepare'") else: if noclean: - cmd = ("python /home/opnfv/repos/functest/ci/run_tests.py " - "-n -t %s" % testname) + cmd = ("python %s/ci/run_tests.py " + "-n -t %s" % (FUNCTEST_REPO, testname)) else: - cmd = ("python /home/opnfv/repos/functest/ci/run_tests.py " - "-t %s" % testname) + cmd = ("python %s/ci/run_tests.py " + "-t %s" % (FUNCTEST_REPO, testname)) ft_utils.execute_command(cmd) diff --git a/cli/commands/cli_tier.py b/cli/commands/cli_tier.py index ea86a79f..31424689 100644 --- a/cli/commands/cli_tier.py +++ b/cli/commands/cli_tier.py @@ -14,6 +14,7 @@ import os import click import functest.ci.tier_builder as tb import functest.utils.functest_utils as ft_utils +from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO functest_yaml = ft_utils.get_functest_yaml() @@ -64,9 +65,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) |