openstack
/
neutron-fwaas
Code Issues Proposed changes

Add special handling for functional tests 

This file had for some time diverged from the copy in the neutron-vpnaas
repository. Let's keep those two the same, there's no need for any
differences. The change brings us an important change that was done
a year ago to neutron-vpnaas.

Import changes for this file from neutron-vpnaas to allow to run
functional tests against neutron: We need to install the proper version
of neutron when testing neutron changes with functional tests from this
repo.
Otherwise those tests install neutron HEAD.

Change-Id: Iafcbd07b2f04fd3462d7f6030defc02a97c5021f
This commit is contained in:
Andreas Jaeger 2016-08-29 19:31:35 +02:00 committed by Andreas Jaeger
parent c3955afb59
commit 3e4fa75b83
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/tox_install.sh
View File

@ -16,20 +16,35 @@
ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner
BRANCH_NAME=master
neutron_installed=$(echo "import neutron" | python 2>/dev/null ; echo $?)
NEUTRON_DIR=$HOME/neutron
set -e
set -x
install_cmd="pip install -c$1"
shift
if [ $neutron_installed -eq 0 ]; then
# The devstack based functional tests have neutron checked out in
# $NEUTRON_DIR on the test systems - with the change to test in it.
# Use this directory if it exists, so that this script installs the
# neutron version to test here.
# Note that the functional tests use sudo to run tox and thus
# variables used for zuul-cloner to check out the correct version are
# lost.
if [ -d "$NEUTRON_DIR" ]; then
echo "FOUND Neutron code at $NEUTRON_DIR - using"
$install_cmd -U -e $NEUTRON_DIR
elif [ $neutron_installed -eq 0 ]; then
echo "ALREADY INSTALLED" > /tmp/tox_install.txt
location=$(python -c "import neutron; print(neutron.__file__)")
echo "ALREADY INSTALLED at $location"
echo "Neutron already installed; using existing package"
elif [ -x "$ZUUL_CLONER" ]; then
echo "ZUUL CLONER" > /tmp/tox_install.txt
# Make this relative to current working directory so that
# git clean can remove it. We cannot remove the directory directly
# since it is reference after $install_cmd -e.
# since it is referenced after $install_cmd -e.
mkdir -p .tmp
NEUTRON_DIR=$(/bin/mktemp -d -p $(pwd)/.tmp)
pushd $NEUTRON_DIR