diff options
| author |   SerenaFeng <feng.xiaowei@zte.com.cn> | 2016-09-01 10:19:58 +0800 |
|---|---|---|
| committer |   Morgan Richomme <morgan.richomme@orange.com> | 2016-09-02 08:10:45 +0000 |
| commit | b582e4a5be0bcc3521cc239a31f681a11f4504db (patch) | |
| tree | b36928805f35e2d2d55c3e3057db6ebf10a89001 /ci | |
| parent | f62e61cb31e3a39026c4f0bbdb6d6b4a1aebc2f3 (diff) | |
stop hardcoded FUNCTEST_REPO path everywhere
functest repo is used by almost every testcase, each place we get it like:
REPOS_DIR = os.getenv('repos_dir')
FUNCTEST_REPO = ("%s/functest" % REPOS_DIR)
provide a common interface in functest_util.py
JIRA: FUNCTEST-453
Change-Id: Ie0635dacc761ed2d05b7e606530368844f32ebaf
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
(cherry picked from commit 470f573a3ac2eb1783efec6da01a3bee33360c65)
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/prepare_env.py | 8 | ||||
| -rwxr-xr-x | ci/run_tests.py | 10 |
2 files changed, 7 insertions, 11 deletions
diff --git a/ci/prepare_env.py b/ci/prepare_env.py index b8c536f1a..0b528cfb3 100755 --- 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") diff --git a/ci/run_tests.py b/ci/run_tests.py index d8f488388..194793838 100755 --- a/ci/run_tests.py +++ b/ci/run_tests.py @@ -8,21 +8,21 @@ # http://www.apache.org/licenses/LICENSE-2.0 # -import argparse import datetime import os import re import sys +import argparse import functest.ci.generate_report as generate_report import functest.ci.tier_builder as tb -from functest.testcases.Controllers.ODL.OpenDaylightTesting import ODLTestCases import functest.utils.functest_logger as ft_logger import functest.utils.functest_utils as ft_utils import functest.utils.openstack_clean as os_clean import functest.utils.openstack_snapshot as os_snapshot import functest.utils.openstack_utils as os_utils - +from functest.testcases.Controllers.ODL.OpenDaylightTesting import ODLTestCases +from functest.utils.functest_utils import FUNCTEST_REPO as FUNCTEST_REPO parser = argparse.ArgumentParser() parser.add_argument("-t", "--test", dest="test", action='store', @@ -41,9 +41,7 @@ logger = ft_logger.Logger("run_tests").getLogger() """ global variables """ -REPOS_DIR = os.getenv('repos_dir') -FUNCTEST_REPO = ("%s/functest/" % REPOS_DIR) -EXEC_SCRIPT = ("%sci/exec_test.sh" % FUNCTEST_REPO) +EXEC_SCRIPT = ("%s/ci/exec_test.sh" % FUNCTEST_REPO) CLEAN_FLAG = True REPORT_FLAG = False EXECUTED_TEST_CASES = [] |