From 238bb50f53a1ad05155ec54260f151aea1e654c3 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Tue, 22 Oct 2024 11:45:57 -0700
Subject: [PATCH] Run watcher-db-manage in grenade testing from venv

grenade install and run everything from virtual env

- https://review.opendev.org/c/openstack/grenade/+/930507

watcher-db-manage in watcher grenade job needs to be run accordingly
and not from system level. Otherwise it will fail with below error
- https://zuul.opendev.org/t/openstack/build/02c3bd4814ea4d0580f7dfd346416425/log/controller/logs/grenade.sh_log.txt

Change-Id: I73e94222c89c6a12a6006d42637cd194a09005ac
---
 devstack/lib/watcher        | 3 +++
 devstack/upgrade/upgrade.sh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/devstack/lib/watcher b/devstack/lib/watcher
index 7108a4695..ec1da4f45 100644
--- a/devstack/lib/watcher
+++ b/devstack/lib/watcher
@@ -275,6 +275,9 @@ function install_watcherclient {
         git_clone_by_name "python-watcherclient"
         setup_dev_lib "python-watcherclient"
     fi
+    if [[ "$GLOBAL_VENV" == "True" ]]; then
+        sudo ln -sf /opt/stack/data/venv/bin/watcher /usr/local/bin
+    fi
 }
 
 # install_watcher() - Collect source and prepare
diff --git a/devstack/upgrade/upgrade.sh b/devstack/upgrade/upgrade.sh
index 4f9b485f4..57e08769e 100755
--- a/devstack/upgrade/upgrade.sh
+++ b/devstack/upgrade/upgrade.sh
@@ -70,7 +70,7 @@ then write_uwsgi_config "$WATCHER_UWSGI_CONF" "$WATCHER_UWSGI" "/infra-optim"
 fi
 
 # Migrate the database
-watcher-db-manage upgrade || die $LINO "DB migration error"
+$WATCHER_BIN_DIR/watcher-db-manage upgrade || die $LINO "DB migration error"
 
 start_watcher