Merge "Align tox_install.sh with other projects"
This commit is contained in:
Zuul
Gerrit Code Review
commit
cfbfa59c7f
@ -1,52 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# This script is borrowed from Sahara who borrowed from neutron-* repos.
|
||||
|
||||
# Many of horizon's repos suffer from the problem of depending on horizon,
|
||||
# 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 horizon 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
|
||||
horizon_installed=$(echo "import horizon" | python 2>/dev/null ; echo $?)
|
||||
|
||||
set -e
|
||||
|
||||
install_cmd="pip install $1"
|
||||
shift
|
||||
|
||||
if [ $horizon_installed -eq 0 ]; then
|
||||
echo "ALREADY INSTALLED" > /tmp/tox_install.txt
|
||||
echo "Horizon already installed; using existing package"
|
||||
elif [ -x "$ZUUL_CLONER" ]; then
|
||||
export ZUUL_BRANCH=${ZUUL_BRANCH-$BRANCH}
|
||||
echo "ZUUL CLONER" > /tmp/tox_install.txt
|
||||
cwd=$(/bin/pwd)
|
||||
cd /tmp
|
||||
$ZUUL_CLONER --cache-dir \
|
||||
/opt/git \
|
||||
--branch $BRANCH_NAME \
|
||||
git://git.openstack.org \
|
||||
openstack/horizon
|
||||
cd openstack/horizon
|
||||
$install_cmd -e .
|
||||
cd "$cwd"
|
||||
else
|
||||
echo "PIP HARDCODE" > /tmp/tox_install.txt
|
||||
if [ -z "$HORIZON_PIP_LOCATION" ]; then
|
||||
HORIZON_PIP_LOCATION="git+https://git.openstack.org/openstack/horizon@$BRANCH_NAME#egg=horizon"
|
||||
fi
|
||||
$install_cmd -U -e ${HORIZON_PIP_LOCATION}
|
||||
fi
|
||||
|
||||
$install_cmd -U $*
|
||||
exit $?
|
||||
65
tools/tox_install.sh
Executable file
65
tools/tox_install.sh
Executable file
@ -0,0 +1,65 @@
|
||||
#!/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
|
||||
GIT_BASE=${GIT_BASE:-https://git.openstack.org/}
|
||||
|
||||
install_project() {
|
||||
local project=$1
|
||||
local branch=${2:-$BRANCH_NAME}
|
||||
local module_name=${project//-/_}
|
||||
|
||||
set +e
|
||||
project_installed=$(echo "import $module_name" | python 2>/dev/null ; echo $?)
|
||||
set -e
|
||||
|
||||
if [ $project_installed -eq 0 ]; then
|
||||
echo "ALREADY INSTALLED" > /tmp/tox_install.txt
|
||||
echo "$project 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
|
||||
PROJECT_DIR=$(/bin/mktemp -d -p $(pwd)/.tmp)
|
||||
pushd $PROJECT_DIR
|
||||
$ZUUL_CLONER --cache-dir \
|
||||
/opt/git \
|
||||
--branch $branch \
|
||||
http://git.openstack.org \
|
||||
openstack/$project
|
||||
cd openstack/$project
|
||||
$install_cmd -e .
|
||||
popd
|
||||
else
|
||||
echo "PIP HARDCODE" > /tmp/tox_install.txt
|
||||
local GIT_REPO="$GIT_BASE/openstack/$project"
|
||||
SRC_DIR="$VIRTUAL_ENV/src/$project"
|
||||
git clone --depth 1 --branch $branch $GIT_REPO $SRC_DIR
|
||||
$install_cmd -U -e $SRC_DIR
|
||||
fi
|
||||
}
|
||||
|
||||
set -e
|
||||
|
||||
install_cmd="pip install -c$1"
|
||||
shift
|
||||
|
||||
install_project horizon
|
||||
|
||||
$install_cmd -U $*
|
||||
exit $?
|
||||
10
tox.ini
10
tox.ini
@ -5,9 +5,7 @@ skipsdist = True
|
||||
|
||||
[testenv]
|
||||
usedevelop = True
|
||||
install_command = {toxinidir}/tools/pip_install.sh \
|
||||
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} \
|
||||
{opts} {packages}
|
||||
install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
|
||||
setenv =
|
||||
VIRTUAL_ENV={envdir}
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
@ -21,10 +19,6 @@ setenv = DJANGO_SETTINGS_MODULE=trove_dashboard.test.settings
|
||||
commands = flake8
|
||||
|
||||
[testenv:venv]
|
||||
# This target does not use script since we do not need to install horizon.
|
||||
install_command = pip install \
|
||||
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} \
|
||||
-U --force-reinstall {opts} {packages}
|
||||
commands = {posargs}
|
||||
|
||||
# Django-1.8 is LTS
|
||||
@ -64,4 +58,4 @@ show-source = True
|
||||
# H405 multi line docstring summary not separated with an empty line
|
||||
ignore = H405
|
||||
builtins = _
|
||||
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,.ropeproject,tools,releasenotes
|
||||
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,.ropeproject,tools,releasenotes,.tmp
|
||||
|
||||
Loading…
Reference in New Issue
Block a user