diff options
| author |   Jose Lausuch <jose.lausuch@ericsson.com> | 2016-09-06 12:21:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-06 12:21:10 +0000 |
| commit | 21979355ccacaa88aa9d60ffca2301a70f9c3855 (patch) | |
| tree | e3ad981c319bf7aa51af2489ba372f223a2d310b | |
| parent | 44364e6db1941410632e6ab732e72bcc718a86da (diff) | |
| parent | 53b8060cd60c163315d706a6035e30eb66fe8d15 (diff) | |
Merge "Add support of arm for doctor"
| -rwxr-xr-x | testcases/features/doctor.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/testcases/features/doctor.py b/testcases/features/doctor.py index 95531596f..badcfe605 100755 --- a/testcases/features/doctor.py +++ b/testcases/features/doctor.py @@ -14,6 +14,7 @@ # # import argparse +import os import time import functest.utils.functest_logger as ft_logger @@ -28,8 +29,8 @@ args = parser.parse_args() functest_yaml = functest_utils.get_functest_yaml() -dirs = functest_yaml.get('general').get('directories') -DOCTOR_REPO = dirs.get('dir_repo_doctor') +DOCTOR_REPO = functest_utils.get_parameter_from_yaml( + 'general.directories.dir_repo_doctor') RESULTS_DIR = functest_utils.get_parameter_from_yaml( 'general.directories.dir_results') @@ -38,6 +39,12 @@ logger = ft_logger.Logger("doctor").getLogger() def main(): exit_code = -1 + + # if the image name is explicitly set for the doctor suite, set it as + # enviroment variable + if 'doctor' in functest_yaml and 'image_name' in functest_yaml['doctor']: + os.environ["IMAGE_NAME"] = functest_yaml['doctor']['image_name'] + cmd = 'cd %s/tests && ./run.sh' % DOCTOR_REPO log_file = RESULTS_DIR + "/doctor.log" |