summaryrefslogtreecommitdiffstats
path: root/docker/features
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-06-19 14:36:46 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-06-19 17:03:26 +0200
commit7cdab4c61f09db66dc0c0a157d90e8ef56bcfa5b (patch)
treea32738075be8d7112e0a647f71a952ca83c7a39d /docker/features
parent019cd1506aba1dfe2c73e7ddeb5de8f4af6d4cd9 (diff)
Add functest in upper-constraints
It's required by OPNFV Features such as sfc. Functest is removed from constraints in Dockerfile else it would conflict with the local dir. Change-Id: I2df5cd151b43eb1a4f0320510183d0f28cdf84c3 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/features')
-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"]