dovetail tool: bugfix for dovetail report and docker build

JIRA: DOVETAIL-353
JIRA: DOVETAIL-354

related patch: https://gerrit.opnfv.org/gerrit/#/c/29049/

Change-Id: Ic871abbda62dead7cf5e23e6117c9885d637c7fb
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>

diff --git a/docker/Dockerfile b/docker/Dockerfile
index c329c53..68579e7 100644 (file)
--- 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 a35ec32..d4be67c 100644 (file)
--- 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