summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-09-05 19:11:21 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-09-05 19:11:21 +0200
commitdfb3c066a1c325ba7ca028be98d9ec04af994f48 (patch)
tree2343d9934a4d4e7d09d0cdc8d4b51d20b3006216 /tests
parent7cbdc3b64449c729c39dd33e1785076b8a127d68 (diff)
Select stable/ocata packages
It also protects if flask is already installed. Change-Id: Iec5d65fe307d702ec6f600333d6bc9cc3ab2ee33 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/run.sh12
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/run.sh b/tests/run.sh
index e1875e09..b5c56872 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -42,6 +42,8 @@ ceilometer="ceilometer $as_doctor_user"
as_admin_user="--os-username admin --os-project-name $DOCTOR_PROJECT
--os-tenant-name $DOCTOR_PROJECT"
+upper_constraints="https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata"
+pip_install="pip install -c${upper_constraints}"
# Functions
@@ -477,16 +479,16 @@ cleanup() {
}
setup_python_packages() {
- sudo pip install flask==0.10.1
- command -v openstack || sudo pip install python-openstackclient==2.3.0
- command -v ceilometer || sudo pip install python-ceilometerclient==2.6.2
- command -v congress || sudo pip install python-congressclient==1.5.0
+ pip freeze |grep -i flask\= > /dev/null || sudo ${pip_install} flask
+ command -v openstack || sudo ${pip_install} python-openstackclient
+ command -v ceilometer || sudo ${pip_install} python-ceilometerclient
+ command -v congress || sudo ${pip_install} python-congressclient
}
# Main process
if [[ $PYTHON_ENABLE == [Tt]rue ]]; then
- which tox || sudo pip install tox
+ which tox || sudo ${pip_install} tox
if [ -f /usr/bin/apt-get ]; then
sudo apt-get install -y python3-dev
elif [ -f /usr/bin/yum ] ; then