diff options
| author |   cristinapauna <cristina.pauna@enea.com> | 2016-09-05 18:51:12 +0300 |
|---|---|---|
| committer |   Jose Lausuch <jose.lausuch@ericsson.com> | 2016-09-06 12:21:26 +0000 |
| commit | 2fbff9c4471f886b51dc1782674f40494541ef47 (patch) | |
| tree | 653427d816d1473a96f884bf33ab054976f94ca9 | |
| parent | 50bac2fa1346bdd637f817fe77f5e043b0e8149f (diff) | |
Add support of arm for doctor
This is half of the fix to make the doctor suite run on arm.
The other half is at https://gerrit.opnfv.org/gerrit/#/c/20369/
In this fix I set an enviroment variable, to be used by
the doctor suite when ran with functest. The variable is set only
when present in config_functest.yaml, which we use as a custom file
when running functest on arm.
Change-Id: If34d3e7734a194bf9fe8b525a362e029767caa4f
Signed-off-by: cristinapauna <cristina.pauna@enea.com>
(cherry picked from commit 53b8060cd60c163315d706a6035e30eb66fe8d15)
| -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 213b56466..68c80a9e4 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" |