summaryrefslogtreecommitdiffstats
path: root/docker/features/Dockerfile
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2018-06-19 15:24:52 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-06-19 15:24:52 +0000
commitb529f96a28d8aeba253cd2cf4b301915fac28c39 (patch)
tree0097d6603018be8b543b10a7df55222347cdb0d5 /docker/features/Dockerfile
parenta695d43010cb7096c0e1291a4f0d50b6abea7400 (diff)
parent7cdab4c61f09db66dc0c0a157d90e8ef56bcfa5b (diff)
Merge "Add functest in upper-constraints"
Diffstat (limited to 'docker/features/Dockerfile')
-rw-r--r--docker/features/Dockerfile7
1 files changed, 4 insertions, 3 deletions
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index bced40549..0d8a6a518 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -12,11 +12,12 @@ RUN apk --no-cache add --update python3 sshpass && \
wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \
sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \
> upper-constraints.txt && \
+ wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH | \
+ sed -E /#egg=functest/d > upper-constraints.opnfv.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 \
+ python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \
doctor-tests && \
- rm -r upper-constraints.txt thirdparty-requirements.txt /src/fds/.git && \
+ rm -r upper-constraints.txt upper-constraints.opnfv.txt thirdparty-requirements.txt /src/fds/.git && \
apk del .build-deps
COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
CMD ["run_tests", "-t", "all"]