From a2c7b1e88d3bf600e3fe015b2d42cc4dcfa595de Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 26 Jun 2017 05:39:23 +0200
Subject: Take OpenStack's constraints into account
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
upper-constraints.txt contains a pinned list of the entire set of
transitive requirements for OpenStack [1].
We will add OPNFV's constraints as well for OPNFV projects and
their requirements when they are ready.
[1] https://specs.openstack.org/openstack/openstack-specs/specs/requirements-management.html
Change-Id: I2e23584f957e4de191341800d24c8b2776ef9143
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
docker/Dockerfile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'docker/Dockerfile')
diff --git a/docker/Dockerfile b/docker/Dockerfile
index ba9a27a1f..3233fdee5 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -29,6 +29,7 @@ ARG FUNCTEST_RESULTS_DIR=${FUNCTEST_BASE_DIR}/results
ARG FUNCTEST_REPO_DIR=${REPOS_DIR}/functest
ARG FUNCTEST_TEST_DIR=${FUNCTEST_REPO_DIR}/functest/opnfv_tests
ARG REPOS_VNFS_DIR=${REPOS_DIR}/vnfs
+ARG PIP_OPTS=-chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?stable/ocata
# Environment variables
ENV HOME /home/opnfv
@@ -77,7 +78,7 @@ RUN mkdir -p ${FUNCTEST_REPO_DIR} \
RUN git config --global http.sslVerify false
COPY thirdparty-requirements.txt thirdparty-requirements.txt
-RUN pip install \
+RUN pip install ${PIP_OPTS} \
git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \
git+https://gerrit.opnfv.org/gerrit/releng@$BRANCH#egg=opnfv\&subdirectory=modules \
git+https://gerrit.opnfv.org/gerrit/snaps@$BRANCH#egg=snaps \
@@ -131,7 +132,7 @@ RUN curl -L https://get.rvm.io | bash -s stable
# SFC integration
RUN /bin/bash -c ". ${REPOS_DIR}/sfc/sfc/tests/functest/setup_scripts/tacker_client_install.sh"
-RUN cd ${REPOS_DIR}/sfc && pip install -e .
+RUN cd ${REPOS_DIR}/sfc && pip install ${PIP_OPTS} -e .
# refstack-client integration
RUN wget -q https://raw.githubusercontent.com/openstack/refstack-client/master/setup_env \
--
cgit