From 7cdab4c61f09db66dc0c0a157d90e8ef56bcfa5b Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Tue, 19 Jun 2018 14:36:46 +0200 Subject: Add functest in upper-constraints MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- docker/core/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docker/core/Dockerfile') 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/ && \ -- cgit 1.2.3-korg