branch supported in Dockerfile and use functest/yardstick danube.2.0

JIRA: DOVETAIL-447

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

diff --git a/docker/Dockerfile b/docker/Dockerfile
index a700a31..294f42c 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,6 +2,8 @@ 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 \
 && \
@@ -27,15 +29,9 @@ WORKDIR /home/opnfv
 RUN \
     git config --global http.sslVerify false \
 && \
-    git clone https://git.opnfv.org/dovetail ${REPOS_DIR} \
-&& \
-    pip install -U pip \
-&& \
-    pip install -r ${REPOS_DIR}/requirements.txt \
-&& \
-    cd ${REPOS_DIR} \
+    pip install git+https://git.opnfv.org/dovetail@$BRANCH#egg=dovetail \
 && \
-    pip install -e .
+    ln -s /usr/local/lib/python2.7/dist-packages/dovetail ${REPOS_DIR}/dovetail
 
 WORKDIR ${REPOS_DIR}/dovetail
 

diff --git a/dovetail/conf/functest_config.yml b/dovetail/conf/functest_config.yml
index 460506a..05eaa90 100644 (file)
--- a/dovetail/conf/functest_config.yml
+++ b/dovetail/conf/functest_config.yml
@@ -1,7 +1,7 @@
 ---
 functest:
   image_name: opnfv/functest
-  docker_tag: latest
+  docker_tag: danube.2.0
   opts: '-id --privileged=true'
   config:
     dir: '/home/opnfv/userconfig'

diff --git a/dovetail/conf/yardstick_config.yml b/dovetail/conf/yardstick_config.yml
index 9f56cb1..34d5a0d 100644 (file)
--- a/dovetail/conf/yardstick_config.yml
+++ b/dovetail/conf/yardstick_config.yml
@@ -1,7 +1,7 @@
 ---
 yardstick:
   image_name: opnfv/yardstick
-  docker_tag: latest
+  docker_tag: danube.2.0
   opts: '-id --privileged=true'
   config:
     dir: '/home/opnfv/userconfig'