From 470f573a3ac2eb1783efec6da01a3bee33360c65 Mon Sep 17 00:00:00 2001 From: SerenaFeng Date: Thu, 1 Sep 2016 10:19:58 +0800 Subject: 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 --- ci/prepare_env.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'ci/prepare_env.py') diff --git a/ci/prepare_env.py b/ci/prepare_env.py index 2dc9e3ab4..49dcdd505 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") -- cgit 1.2.3-korg