aboutsummaryrefslogtreecommitdiffstats
path: root/docker/core/Dockerfile
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/core/Dockerfile
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/core/Dockerfile')
-rw-r--r--docker/core/Dockerfile6
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index cb44105af..390b00d85 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -9,12 +9,12 @@ RUN apk --no-cache add --update \
apk --no-cache add --virtual .build-deps --update \
python-dev build-base linux-headers libffi-dev \
openssl-dev libjpeg-turbo-dev && \
- wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
- > upper-constraints.txt && \
+ wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH | \
+ sed -E /#egg=functest/d > upper-constraints.txt && \
git clone https://gerrit.opnfv.org/gerrit/functest /src/functest && \
(cd /src/functest && git fetch origin $BRANCH && git checkout FETCH_HEAD) && \
pip install --no-cache-dir --src /src -cupper-constraints.txt \
- -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
+ -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
/src/functest && \
rm -r upper-constraints.txt /src/functest && \
cp /usr/lib/python2.7/site-packages/functest/ci/logging.ini /usr/lib/python2.7/site-packages/xtesting/ci/ && \