diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-09-05 23:01:58 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-09-06 10:30:23 +0200 |
| commit | 2de7635766408d4e6dcb8475fc99d95a3195d2de (patch) | |
| tree | 4ba5b37f0a7f5b6668034ba6b82025b2d60152fb /docker/smoke | |
| parent | 66104a29635e55e6ff45836428c81d8d71f587d3 (diff) | |
Unlink Functest and FDS tags
Otherwise it forbids building Functest containers from a gerrit
change.
Change-Id: I936fc338d17a710bd9403670cd17aabc89c5cc2c
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/smoke')
| -rw-r--r-- | docker/smoke/Dockerfile | 3 |
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 \ |