From 08b09b6f83b2bbdea0a7f8a103fc2caec6c547d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= <tomasz.trebski@ts.fujitsu.com>
Date: Tue, 24 Oct 2017 09:05:34 +0200
Subject: [PATCH] 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
---
 requirements.txt     |  1 +
 tools/tox_install.sh | 22 ----------------------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index b98899bd..d416fd5d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -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
diff --git a/tools/tox_install.sh b/tools/tox_install.sh
index 0a88e89b..af1b33a5 100755
--- a/tools/tox_install.sh
+++ b/tools/tox_install.sh
@@ -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 $?