aboutsummaryrefslogtreecommitdiffstats
path: root/docker/features/Dockerfile
diff options
context:
space:
mode:
authorLinda Wang <wangwulin@huawei.com>2017-10-26 01:37:37 +0000
committerLinda Wang <wangwulin@huawei.com>2017-11-06 14:12:45 +0000
commitfb3ffed7e8128416094e80ecf126c9ca51933c69 (patch)
tree6191a84b1ba02ae106872fc98cff97ffc9f98e3e /docker/features/Dockerfile
parent5fe48568e50ad9a556cc4094ee05e76d9255a05d (diff)
Move fds to features tier
Change-Id: I7aa9d73c7ffbfdad7d5a929968fb640d9a8de62e Signed-off-by: Linda Wang <wangwulin@huawei.com>
Diffstat (limited to 'docker/features/Dockerfile')
-rw-r--r--docker/features/Dockerfile4
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index 0d53655a..6d590bd0 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -2,6 +2,7 @@ FROM opnfv/functest-core
ARG BRANCH=master
ARG OPENSTACK_TAG=stable/pike
+ARG FDS_TAG=master
COPY thirdparty-requirements.txt thirdparty-requirements.txt
RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass && \
@@ -14,13 +15,14 @@ RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass && \
pip install --no-cache-dir --src /src -cupper-constraints.txt \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-rthirdparty-requirements.txt && \
+ git clone --depth 1 -b $FDS_TAG https://gerrit.opnfv.org/gerrit/fds /src/fds && \
python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
doctor-tests && \
npm -g install npm@latest && \
# the next line must be uncommented as soon as promise is synced with pike
# (cd /src/promise/source && npm install) && \
- rm -r upper-constraints.txt thirdparty-requirements.txt && \
+ rm -r upper-constraints.txt thirdparty-requirements.txt /src/fds/.git && \
apk del .build-deps
COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml
CMD ["bash","-c","prepare_env start && run_tests -t all"]