[Asterisk-code-review] CI: Fixing path issue on venv check (asterisk[18])

[Michael Bradeen]

Michael Bradeen has uploaded this change for review. ( https://gerrit.asterisk.org/c/asterisk/+/19026 )


Change subject: CI: Fixing path issue on venv check
......................................................................

CI: Fixing path issue on venv check

ASTERISK-26826

Change-Id: I07388d16f74452cebc9c981f99044eb6b77df792
---
M tests/CI/runTestsuite.sh
1 file changed, 14 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/26/19026/1

diff --git a/tests/CI/runTestsuite.sh b/tests/CI/runTestsuite.sh
index 2308349..ec4292c 100755
--- a/tests/CI/runTestsuite.sh
+++ b/tests/CI/runTestsuite.sh
@@ -4,7 +4,6 @@
 TEST_TIMEOUT=600
 source $CIDIR/ci.functions
 ASTETCDIR=$DESTDIR/etc/asterisk
-SETUPVENV=$TESTSUITE_DIR/setupVenv.sh
 
 if [ x"$WORK_DIR" != x ] ; then
 	export AST_WORK_DIR="$(readlink -f $WORK_DIR)"
@@ -19,11 +18,13 @@
 fi
 
 # check to see if venv scripts exist so we can use them
-if [ -f "$SETUPVENV" ] ; then
+if [ -f ./setupVenv.sh ] ; then
+	echo "Running in Virtual Environment"
 	# explicitly invoking setupVenv to capture output in case of failure
 	./setupVenv.sh
 	VENVPREFIX="runInVenv.sh python "
 else
+	echo "Running in Legacy Mode"
 	export PYTHONPATH=./lib/python/
 fi
 

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/19026
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 18
Gerrit-Change-Id: I07388d16f74452cebc9c981f99044eb6b77df792
Gerrit-Change-Number: 19026
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Bradeen <mbradeen at sangoma.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20220831/3a7a0ff5/attachment.html>