Stop doing any magic cloning of neutron during CI

Hopefully this will allow the Zuul "Depends-On" thing to work better.

Adopting the solution developed by Doug Wiegley for LBaaS:
c61f920f2a54fd829ee37484b3743ab77b909847

Change-Id: Id3f716b9f151dbb99cc02ddec00a841bea7ad463
changes/11/211411/3
Henry Gessau 2015-08-10 23:23:18 -04:00
parent 73c856dec4
commit 9591b6d90a
3 changed files with 45 additions and 3 deletions

View File

@ -5,4 +5,3 @@
pbr<2.0,>=0.11
Babel>=1.3
python-neutronclient>=2.3.10
-e git+https://git.openstack.org/openstack/neutron.git#egg=neutron

42
tools/tox_install.sh Executable file
View File

@ -0,0 +1,42 @@
#!/bin/sh
# Many of neutron's repos suffer from the problem of depending on neutron,
# but it not existing on pypi.
# This wrapper for tox's package installer will use the existing package
# if it exists, else use zuul-cloner if that program exists, else grab it
# from neutron master via a hard-coded URL. That last case should only
# happen with devs running unit tests locally.
# From the tox.ini config page:
# install_command=ARGV
# default:
# pip install {opts} {packages}
ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner
neutron_installed=$(echo "import neutron" | python 2>/dev/null ; echo $?)
set -ex
cwd=$(/bin/pwd)
if [ $neutron_installed -eq 0 ]; then
echo "ALREADY INSTALLED" > /tmp/tox_install.txt
echo "Neutron already installed; using existing package"
elif [ -x "$ZUUL_CLONER" ]; then
echo "ZUUL CLONER" > /tmp/tox_install.txt
cd /tmp
$ZUUL_CLONER --cache-dir \
/opt/git \
git://git.openstack.org \
openstack/neutron
cd openstack/neutron
pip install -e .
cd "$cwd"
else
echo "PIP HARDCODE" > /tmp/tox_install.txt
pip install -U -egit+https://git.openstack.org/openstack/neutron#egg=neutron
fi
pip install -U $*
exit $?

View File

@ -6,8 +6,9 @@ skipsdist = True
[testenv]
setenv = VIRTUAL_ENV={envdir}
usedevelop = True
install_command = pip install -r requirements.txt -U {opts} {packages}
deps = -r{toxinidir}/test-requirements.txt
install_command = {toxinidir}/tools/tox_install.sh {opts} {packages}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
whitelist_externals = sh
commands = python setup.py testr --slowest --testr-args='{posargs}'