Keep upper-constraints for periodic neutron UTs against lib changes

Rather than bypassing upper-constraints during the requirement install
phase, keep them to avoid failures due to unpinned requirements, but
modify it to run the master version of neutron-lib as done f for
local requirements.

This should solve the last failures observed on the periodic queue

[1] http://logs.openstack.org/periodic/

Change-Id: I58d6f30bca3b6c03346736a6929d44730ce1a111
This commit is contained in:
Armando Migliaccio 2016-07-18 11:31:17 -07:00
parent a8fe0209c3
commit ed07624200

View File

@ -14,6 +14,7 @@ fi
script_path=/usr/local/jenkins/slave_scripts
sed -i "s/neutron-lib.*/-e git+https:\/\/git.openstack.org\/openstack\/neutron-lib.git#egg=neutron-lib/g" requirements.txt
sed -i "s/neutron-lib.*/-e git+https:\/\/git.openstack.org\/openstack\/neutron-lib.git#egg=neutron-lib/g" upper-constraints.txt
cat << EOF >> tox.ini
@ -21,7 +22,6 @@ cat << EOF >> tox.ini
setenv = VIRTUAL_ENV={envdir}
passenv = TRACE_FAILONLY GENERATE_HASHES http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
usedevelop = True
install_command = pip install {opts} {packages}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
whitelist_externals = sh