diff options
| author |   MatthewLi <matthew.lijun@huawei.com> | 2017-06-20 02:43:32 -0400 |
|---|---|---|
| committer | MatthewLi <matthew.lijun@huawei.com> | 2017-06-20 02:43:32 -0400 |
| commit | 2ab5f766fe67e4251d54d5c583503324537cd8f2 (patch) | |
| tree | 6aa3917c32a2e2dc78bdaaf9ad8a5db4380b0ee1 | |
| parent | 263e1a93ea6d1a3bbbf773efb41338bd789a1269 (diff) | |
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>
| -rw-r--r-- | docker/Dockerfile | 12 | ||||
| -rw-r--r-- | dovetail/conf/functest_config.yml | 2 | ||||
| -rw-r--r-- | dovetail/conf/yardstick_config.yml | 2 |
3 files changed, 6 insertions, 10 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index a700a313..294f42c6 100644 --- 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 460506a6..05eaa909 100644 --- 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 9f56cb11..34d5a0d8 100644 --- 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' |