From 2516484ffc5339e2d52dc1dc683804e30e21c162 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Tue, 29 May 2018 10:32:09 +0100 Subject: [PATCH] Use upper constraints when installing ARA Currently lint tests are failing due to ARA bringing in extra packages unconstrained. Here we ensure that the upper constraints are applied when installing ARA. Change-Id: I35e3688ae632d5f7747f32dafc41d23883c033c5 --- test-ansible-env-prep.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test-ansible-env-prep.sh b/test-ansible-env-prep.sh index a1ebb57b..93c9575f 100755 --- a/test-ansible-env-prep.sh +++ b/test-ansible-env-prep.sh @@ -87,9 +87,15 @@ function setup_ara { # Install ARA from source if running in ARA gate, otherwise install from PyPi ARA_SRC_HOME="${TESTING_HOME}/src/git.openstack.org/openstack/ara" if [[ -d "${ARA_SRC_HOME}" ]]; then - pip install --constraint "${COMMON_TESTS_PATH}/test-ansible-deps.txt" "${ARA_SRC_HOME}" + pip install \ + --constraint "${COMMON_TESTS_PATH}/test-ansible-deps.txt" \ + --constraint ${UPPER_CONSTRAINTS_FILE:-https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} \ + "${ARA_SRC_HOME}" else - pip install --constraint "${COMMON_TESTS_PATH}/test-ansible-deps.txt" ara + pip install \ + --constraint "${COMMON_TESTS_PATH}/test-ansible-deps.txt" \ + --constraint ${UPPER_CONSTRAINTS_FILE:-https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} \ + ara fi # Dynamically figure out the location of ARA (ex: py2 vs py3)