Make tox working for zuulv3

Previously taken approach, where python-monascacient, is installed
from the Zuul reference or master made the new ZuulV3 based
tox gates failing.

Change-Id: I864a83862958ec21a681254d7c7a0efb72cf194a
This commit is contained in:
Tomasz Trębski 2017-10-24 09:05:34 +02:00
parent 1c0bb61672
commit 08b09b6f83
2 changed files with 1 additions and 22 deletions

View File

@ -1,5 +1,6 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
oslo.log>=3.30.0 # Apache-2.0
python-monascaclient>=1.7.0 # Apache-2.0
Django<2.0,>=1.8 # BSD

View File

@ -9,27 +9,6 @@ BRANCH_NAME=master
PACKAGE_NAME=monasca-ui
requirements_installed=$(echo "import openstack_requirements" | python 2>/dev/null ; echo $?)
function install_client_depends_on() {
local client_location
if [ -x "$ZUUL_CLONER" ]; then
# install in gate environment
pushd $mydir
$ZUUL_CLONER --cache-dir \
/opt/git \
git://git.openstack.org \
openstack/python-monascaclient
cd openstack/python-monascaclient
echo "Using python-monascaclient $(git log -n 1 --oneline)"
client_location="file://$PWD#egg=python_monascaclient"
popd
else
echo "Using python-monascaclient@master"
client_location="git+https://git.openstack.org/openstack/python-monascaclient@master#egg=python_monascaclient"
fi
edit-constraints $localfile -- "python-monascaclient" "$client_location"
$install_cmd -U "$client_location"
}
set -e
git config --global url.https://git.openstack.org/.insteadOf git://git.openstack.org/
@ -72,7 +51,6 @@ fi
# 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 -- $PACKAGE_NAME "-e file://$PWD#egg=$PACKAGE_NAME"
install_client_depends_on
$install_cmd -U $*
exit $?