Make it work with devstack
To avoid the "installation from path or url cannot be constrained to a version" issue. Change-Id: Ia602a6509780c394b30c2f663fe1207e69706e32
This commit is contained in:
parent
b35f019bc0
commit
5f29b14577
@ -3,7 +3,6 @@
|
|||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
|
|
||||||
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
|
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
|
||||||
http://tarballs.openstack.org/horizon/horizon-master.tar.gz#egg=horizon
|
|
||||||
coverage!=4.4,>=4.0 # Apache-2.0
|
coverage!=4.4,>=4.0 # Apache-2.0
|
||||||
ddt>=1.0.1 # MIT
|
ddt>=1.0.1 # MIT
|
||||||
django-nose>=1.4.4 # BSD
|
django-nose>=1.4.4 # BSD
|
||||||
|
@ -1,5 +1,71 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# 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
|
||||||
|
|
||||||
|
install_project() {
|
||||||
|
local project=$1
|
||||||
|
local branch=${2:-$BRANCH_NAME}
|
||||||
|
local PROJECT_DIR=$HOME/$project
|
||||||
|
|
||||||
|
set +e
|
||||||
|
project_installed=$(echo "import $project" | python 2>/dev/null ; echo $?)
|
||||||
|
set -e
|
||||||
|
|
||||||
|
# The devstack based functional tests have project checked out in
|
||||||
|
# $PROJECT_DIR on the test systems - with the change to test in it.
|
||||||
|
# Use this directory if it exists, so that this script installs the
|
||||||
|
# project 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 "$PROJECT_DIR" ]; then
|
||||||
|
echo "FOUND $project code at $PROJECT_DIR - using"
|
||||||
|
$install_cmd -U $PROJECT_DIR
|
||||||
|
elif [ $project_installed -eq 0 ]; then
|
||||||
|
echo "ALREADY INSTALLED" > /tmp/tox_install.txt
|
||||||
|
location=$(python -c "import $project; print($project.__file__)")
|
||||||
|
echo "ALREADY INSTALLED at $location"
|
||||||
|
|
||||||
|
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
|
||||||
|
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 .
|
||||||
|
popd
|
||||||
|
else
|
||||||
|
echo "PIP HARDCODE" > /tmp/tox_install.txt
|
||||||
|
if [ -z "$PIP_LOCATION" ]; then
|
||||||
|
PIP_LOCATION="git+https://git.openstack.org/openstack/$project@$branch#egg=$project"
|
||||||
|
fi
|
||||||
|
$install_cmd -U ${PIP_LOCATION}
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
# Client constraint file contains this client version pin that is in conflict
|
# Client constraint file contains this client version pin that is in conflict
|
||||||
# with installing the client from source. We should remove the version pin in
|
# with installing the client from source. We should remove the version pin in
|
||||||
# the constraints file before applying it for from-source installation.
|
# the constraints file before applying it for from-source installation.
|
||||||
@ -8,6 +74,7 @@ CONSTRAINTS_FILE="$1"
|
|||||||
shift 1
|
shift 1
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
set -x
|
||||||
|
|
||||||
# NOTE(tonyb): Place this in the tox enviroment's log dir so it will get
|
# NOTE(tonyb): Place this in the tox enviroment's log dir so it will get
|
||||||
# published to logs.openstack.org for easy debugging.
|
# published to logs.openstack.org for easy debugging.
|
||||||
@ -26,5 +93,9 @@ pip install -c"$localfile" openstack-requirements
|
|||||||
# install will be constrained and we need to unconstrain it.
|
# install will be constrained and we need to unconstrain it.
|
||||||
edit-constraints "$localfile" -- "$CLIENT_NAME"
|
edit-constraints "$localfile" -- "$CLIENT_NAME"
|
||||||
|
|
||||||
pip install -c"$localfile" -U "$@"
|
install_cmd="pip install -c$localfile"
|
||||||
|
|
||||||
|
install_project horizon
|
||||||
|
|
||||||
|
$install_cmd -U $*
|
||||||
exit $?
|
exit $?
|
||||||
|
2
tox.ini
2
tox.ini
@ -63,4 +63,4 @@ commands = npm install
|
|||||||
show-source = True
|
show-source = True
|
||||||
ignore = E123,E125
|
ignore = E123,E125
|
||||||
builtins = _
|
builtins = _
|
||||||
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,node_modules
|
exclude=.venv,.git,.tox,.tmp,dist,doc,*lib/python*,*egg,build,node_modules
|
||||||
|
Loading…
x
Reference in New Issue
Block a user