diff options
| -rw-r--r-- | docker/Dockerfile.aarch64.patch | 32 | ||||
| -rw-r--r-- | dovetail/report.py | 20 | ||||
| -rwxr-xr-x | dovetail/run.py | 4 |
3 files changed, 46 insertions, 10 deletions
diff --git a/docker/Dockerfile.aarch64.patch b/docker/Dockerfile.aarch64.patch new file mode 100644 index 00000000..b96b619f --- /dev/null +++ b/docker/Dockerfile.aarch64.patch @@ -0,0 +1,32 @@ +From: Alexandru Nemes <alexandru.nemes@enea.com> +Date: Mon, 24 Apr 2017 11:53:42 +0300 +Subject: [PATCH] Add AArch64 support for Dovetail docker file + +Signed-off-by: Alexandru Nemes <alexandru.nemes@enea.com> +--- + docker/Dockerfile | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/docker/Dockerfile b/docker/Dockerfile +index 8cc15e0..bbab012 100644 +--- a/docker/Dockerfile ++++ b/docker/Dockerfile +@@ -1,6 +1,6 @@ +-FROM ubuntu:14.04 +-MAINTAINER Leo Wang <grakiss.wanglei@huawei.com> +-LABEL version="0.1" description="OPNFV Dovetail Docker Container" ++FROM aarch64/ubuntu:16.04 ++MAINTAINER Armband team <armband@enea.com> ++LABEL version="0.1" description="OPNFV Dovetail AArch64 Docker Container" + + RUN \ + apt-get update \ +@@ -28,6 +28,8 @@ RUN \ + && \ + mkdir -p ${REPOS_DIR}/results \ + && \ ++ pip install -U setuptools \ ++&& \ + pip install -U pip \ + && \ + pip install -r ${REPOS_DIR}/requirements.txt \ diff --git a/dovetail/report.py b/dovetail/report.py index c51ce687..2c6200d3 100644 --- a/dovetail/report.py +++ b/dovetail/report.py @@ -416,16 +416,20 @@ class FunctestChecker(object): testcase_passed = 'SKIP' for sub_testcase in sub_testcase_list: self.logger.debug('check sub_testcase:%s', sub_testcase) - if self.get_sub_testcase(sub_testcase, - db_result['details']['errors']): + try: + if self.get_sub_testcase(sub_testcase, + db_result['details']['errors']): + testcase.sub_testcase_passed(sub_testcase, 'FAIL') + testcase_passed = 'FAIL' + continue + if self.get_sub_testcase(sub_testcase, + db_result['details']['skipped']): + testcase.sub_testcase_passed(sub_testcase, 'SKIP') + else: + testcase.sub_testcase_passed(sub_testcase, 'PASS') + except KeyError: testcase.sub_testcase_passed(sub_testcase, 'FAIL') testcase_passed = 'FAIL' - continue - if self.get_sub_testcase(sub_testcase, - db_result['details']['skipped']): - testcase.sub_testcase_passed(sub_testcase, 'SKIP') - else: - testcase.sub_testcase_passed(sub_testcase, 'PASS') if testcase_passed == 'SKIP': for sub_testcase in sub_testcase_list: diff --git a/dovetail/run.py b/dovetail/run.py index f268f921..607e1b15 100755 --- a/dovetail/run.py +++ b/dovetail/run.py @@ -54,8 +54,8 @@ def run_test(testsuite, testarea, logger): continue run_testcase = True - if testcase.exceed_max_retry_times(): - run_testcase = False + # if testcase.exceed_max_retry_times(): + # run_testcase = False # if testcase.script_result_acquired(): # run_testcase = False |