Avoid tox-install.sh
Instead of using tox-install.sh, we can install horizon and neutron now directly from pypi - or use the current branch in CI system using tox-siblings. Update tox.ini for this change and add neutron to requirements file. Change-Id: I29c17d51f2648e4bdef1a8c9799ca5e785aa3423
This commit is contained in:
parent
a791da25fc
commit
4b315e1027
|
@ -17,7 +17,4 @@ oslo.service!=1.28.1,>=1.24.0 # Apache-2.0
|
|||
oslo.utils>=3.33.0 # Apache-2.0
|
||||
oslo.privsep>=1.23.0 # Apache-2.0
|
||||
pyroute2>=0.4.21;sys_platform!='win32' # Apache-2.0 (+ dual licensed GPL2)
|
||||
# This project does depend on neutron as a library, but the
|
||||
# openstack tooling does not play nicely with projects that
|
||||
# are not publicly available in pypi.
|
||||
# -e git+https://git.openstack.org/openstack/neutron#egg=neutron
|
||||
neutron>=12.0.0 # Apache-2.0
|
||||
|
|
|
@ -1,70 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
# 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
|
||||
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
|
||||
|
||||
# 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 referenced after $install_cmd -e.
|
||||
mkdir -p .tmp
|
||||
NEUTRON_DIR=$(/bin/mktemp -d -p $(pwd)/.tmp)
|
||||
pushd $NEUTRON_DIR
|
||||
$ZUUL_CLONER --cache-dir \
|
||||
/opt/git \
|
||||
--branch $BRANCH_NAME \
|
||||
git://git.openstack.org \
|
||||
openstack/neutron
|
||||
cd openstack/neutron
|
||||
$install_cmd -e .
|
||||
popd
|
||||
else
|
||||
echo "PIP HARDCODE" > /tmp/tox_install.txt
|
||||
if [ -z "$NEUTRON_GIT_REPO" ]; then
|
||||
NEUTRON_GIT_REPO="https://git.openstack.org/openstack/neutron"
|
||||
fi
|
||||
SRC_DIR="$VIRTUAL_ENV/src/neutron"
|
||||
git clone --depth 1 --branch $BRANCH_NAME $NEUTRON_GIT_REPO $SRC_DIR
|
||||
$install_cmd -U -e $SRC_DIR
|
||||
fi
|
||||
|
||||
$install_cmd -U $*
|
||||
exit $?
|
5
tox.ini
5
tox.ini
|
@ -7,9 +7,8 @@ skipsdist = True
|
|||
setenv = VIRTUAL_ENV={envdir}
|
||||
PYTHONWARNINGS=default::DeprecationWarning
|
||||
usedevelop = True
|
||||
install_command =
|
||||
{toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
|
||||
-r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
whitelist_externals = sh find
|
||||
commands =
|
||||
|
|
Loading…
Reference in New Issue