From: MatthewLi <matthew.lijun@huawei.com>
Date: Mon, 20 Feb 2017 06:28:24 +0000 (-0500)
Subject: dovetail tool: bugfix for dovetail report and docker build
X-Git-Tag: ovp.0.9.0~219^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=85568afd806e36ff9885b52313b32b70c9693ad0;p=dovetail.git

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 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