Take OpenStack's constraints into account

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>

diff --git a/docker/Dockerfile b/docker/Dockerfile
index ba9a27a..3233fde 100644 (file)
--- 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 \

diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64
index 2b85928..7becdf2 100644 (file)
--- a/docker/Dockerfile.aarch64
+++ b/docker/Dockerfile.aarch64
@@ -28,6 +28,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
@@ -76,7 +77,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 \
@@ -123,7 +124,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 \

diff --git a/tox.ini b/tox.ini
index bdc32ea..5622e33 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -8,6 +8,9 @@ deps =
   -r{toxinidir}/test-requirements.txt
   git+https://gerrit.opnfv.org/gerrit/releng#egg=opnfv&subdirectory=modules
   git+https://gerrit.opnfv.org/gerrit/snaps#egg=snaps
+install_command = pip install \
+  -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?stable/ocata \
+  {opts} {packages}
 commands = nosetests --with-xunit \
   --with-coverage \
   --cover-tests \