diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-09-07 14:49:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-07 14:49:50 +0000 |
| commit | 227afb8285b8f178987a7d6eb1d28a74201a5d1b (patch) | |
| tree | 2501ab95b10e2958f93f6db7eba5fba66c136dd2 /ci/prepare_env.py | |
| parent | 800d0ed2c883a51122b7fa1aa4d9d86405ae5416 (diff) | |
| parent | f3381f49cc72fded67c1febe78b27e18ec396878 (diff) | |
Merge "remove imported FUNCTEST_REPO object"
Diffstat (limited to 'ci/prepare_env.py')
| -rwxr-xr-x | ci/prepare_env.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ci/prepare_env.py b/ci/prepare_env.py index 49dcdd50..49b3ea75 100755 --- a/ci/prepare_env.py +++ b/ci/prepare_env.py @@ -20,11 +20,11 @@ import subprocess import sys import argparse +import yaml + 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() @@ -204,7 +204,7 @@ def patch_config_file(): def verify_deployment(): print_separator() logger.info("Verifying OpenStack services...") - cmd = ("%s/ci/check_os.sh" % FUNCTEST_REPO) + cmd = ("%s/ci/check_os.sh" % ft_utils.FUNCTEST_REPO) logger.debug("Executing command: %s" % cmd) p = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True) |