diff options
| author |   hongbo tian <hongbo.tianhongbo@huawei.com> | 2017-02-24 07:51:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-02-24 07:51:43 +0000 |
| commit | 04a464ac81ac43f536ba73af3666a149c97f8369 (patch) | |
| tree | ba53552c5258f4765738b2f8a367a76a642700fa | |
| parent | 2bb3fcf3ff3dc78e89c49369fd39339cfe9fd588 (diff) | |
| parent | 85568afd806e36ff9885b52313b32b70c9693ad0 (diff) | |
Merge "dovetail tool: bugfix for dovetail report and docker build"
| -rw-r--r-- | docker/Dockerfile | 4 | ||||
| -rw-r--r-- | dovetail/report.py | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index c329c53d..68579e7f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,8 +2,6 @@ FROM ubuntu:14.04 MAINTAINER Leo Wang <grakiss.wanglei@huawei.com> LABEL version="0.1" description="OPNFV Dovetail Docker Container" -ARG BRANCH=master - RUN \ apt-get update \ && \ @@ -23,7 +21,7 @@ WORKDIR /home/opnfv RUN \ git config --global http.sslVerify false \ && \ - git clone --depth 1 -b $BRANCH https://git.opnfv.org/dovetail ${REPOS_DIR} \ + git clone https://git.opnfv.org/dovetail ${REPOS_DIR} \ && \ mkdir -p ${REPOS_DIR}/results \ && \ diff --git a/dovetail/report.py b/dovetail/report.py index a35ec323..d4be67c6 100644 --- a/dovetail/report.py +++ b/dovetail/report.py @@ -439,9 +439,9 @@ class YardstickChecker(object): @staticmethod def check(testcase, result): if not result: - testcase.passed(False) + testcase.passed('FAIL') else: - testcase.passed(result['criteria'] == 'PASS') + testcase.passed(result['criteria']) return |