summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2017-09-07 06:20:36 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-07 06:20:36 +0000
commite927478280fc7f81b657a99af33d14958d9e2586 (patch)
tree9763f358e23cb15b89d5f7d72fcc33ad19b95540
parentec749b2b2601cf31dadc4026d64299a1c705ec8d (diff)
parent2de7635766408d4e6dcb8475fc99d95a3195d2de (diff)
Merge "Unlink Functest and FDS tags"
-rw-r--r--docker/smoke/Dockerfile3
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 3b9007218..26a473800 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -3,6 +3,7 @@ FROM opnfv/functest-core
ARG BRANCH=master
ARG OPENSTACK_TAG=stable/ocata
ARG ODL_TAG=release/carbon
+ARG FDS_TAG=master
COPY thirdparty-requirements.txt thirdparty-requirements.txt
RUN apk --no-cache add --virtual .build-deps --update \
@@ -19,7 +20,7 @@ RUN apk --no-cache add --virtual .build-deps --update \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-rthirdparty-requirements.txt && \
git clone --depth 1 -b $ODL_TAG https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \
- git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/fds /src/fds && \
+ git clone --depth 1 -b $FDS_TAG https://gerrit.opnfv.org/gerrit/fds /src/fds && \
ln -s /src/tempest /src/refstack-client/.tempest && \
virtualenv --system-site-packages /src/tempest/.venv && \
rm -r thirdparty-requirements.txt /src/refstack-client/.git /src/odl_test/.git \