Add tox_install.sh for pypowervm upper-constraints workaround

With the recent addition of pypowervm to upper-constraints, installs
of nova-powervm are now by default enforcing the version set there.
Since the master branch of nova-powervm depends on the develop
version of pypowervm, this causes installs to fail.

This changeset adds a wrapper script (tox_install.sh) that edits
the upper-constraints file and replaces the pypowervm version pin
then sets pypowervm to be installed from source instead.

Change-Id: Id8e117bc6a7b1b224a9e86e9b29821627adb51db
changes/13/398513/2
Adam Reznechek 6 years ago
parent a8ebbb893b
commit c6d94844b8

@ -6,5 +6,6 @@ oslo.config>=3.10.0 # Apache-2.0
oslo.log>=1.14.0 # Apache-2.0
oslo.serialization>=1.10.0 # Apache-2.0
oslo.utils>=3.11.0 # Apache-2.0
pypowervm
taskflow>=1.26.0 # Apache-2.0
setuptools>=16.0

@ -0,0 +1,59 @@
#!/usr/bin/env bash
# Base code from https://github.com/openstack/glance_store/blob/master/tools/tox_install.sh
#
# Library constraint file contains version pin that is in conflict with
# installing the library from source. We should replace the version pin in
# the constraints file before applying it for from-source installation.
ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner
BRANCH_NAME=master
LIB_NAME=pypowervm
LIB_BRANCH=develop
LIB_LOCATION=git+https://github.com/powervm/$LIB_NAME@$LIB_BRANCH#egg=$LIB_NAME
requirements_installed=$(echo "import openstack_requirements" | python 2>/dev/null ; echo $?)
set -e -x
CONSTRAINTS_FILE=$1
shift
install_cmd="pip install"
mydir=$(mktemp -dt "$LIB_NAME-tox_install-XXXXXXX")
trap "rm -rf $mydir" EXIT
localfile=$mydir/upper-constraints.txt
if [[ $CONSTRAINTS_FILE != http* ]]; then
CONSTRAINTS_FILE=file://$CONSTRAINTS_FILE
fi
curl $CONSTRAINTS_FILE -k -o $localfile
install_cmd="$install_cmd -c$localfile"
if [ $requirements_installed -eq 0 ]; then
echo "ALREADY INSTALLED" > /tmp/tox_install.txt
echo "Requirements already installed; using existing package"
elif [ -x "$ZUUL_CLONER" ]; then
echo "ZUUL CLONER" > /tmp/tox_install.txt
pushd $mydir
$ZUUL_CLONER --cache-dir \
/opt/git \
--branch $BRANCH_NAME \
git://git.openstack.org \
openstack/requirements
cd openstack/requirements
$install_cmd -e .
popd
else
echo "PIP HARDCODE" > /tmp/tox_install.txt
if [ -z "$REQUIREMENTS_PIP_LOCATION" ]; then
REQUIREMENTS_PIP_LOCATION="git+https://git.openstack.org/openstack/requirements@$BRANCH_NAME#egg=requirements"
fi
$install_cmd -U -e ${REQUIREMENTS_PIP_LOCATION}
fi
# This is the main purpose of the script: Allow local installation of
# the current repo. It is listed in constraints file and thus any
# install will be constrained and we need to unconstrain it.
edit-constraints $localfile -- $LIB_NAME "-e $LIB_LOCATION"
$install_cmd -U $*
exit $?

@ -5,13 +5,13 @@ skipsdist = True
[testenv]
usedevelop = True
install_command = pip install -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
-r{toxinidir}/test-requirements.txt
-egit+https://github.com/openstack/nova#egg=nova
-egit+https://github.com/powervm/pypowervm@develop#egg=pypowervm
whitelist_externals = bash
commands = bash tools/pretty_tox.sh '{posargs}'

Loading…
Cancel
Save