CI: Fixing path issue on venv check
ASTERISK-26826 Change-Id: I07388d16f74452cebc9c981f99044eb6b77df792
This commit is contained in:
parent
709468d34f
commit
149319265f
|
@ -4,7 +4,6 @@ REALTIME=0
|
||||||
TEST_TIMEOUT=600
|
TEST_TIMEOUT=600
|
||||||
source $CIDIR/ci.functions
|
source $CIDIR/ci.functions
|
||||||
ASTETCDIR=$DESTDIR/etc/asterisk
|
ASTETCDIR=$DESTDIR/etc/asterisk
|
||||||
SETUPVENV=$TESTSUITE_DIR/setupVenv.sh
|
|
||||||
|
|
||||||
if [ x"$WORK_DIR" != x ] ; then
|
if [ x"$WORK_DIR" != x ] ; then
|
||||||
export AST_WORK_DIR="$(readlink -f $WORK_DIR)"
|
export AST_WORK_DIR="$(readlink -f $WORK_DIR)"
|
||||||
|
@ -19,11 +18,13 @@ if [ $REALTIME -eq 1 ] ; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# check to see if venv scripts exist so we can use them
|
# 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
|
# explicitly invoking setupVenv to capture output in case of failure
|
||||||
./setupVenv.sh
|
./setupVenv.sh
|
||||||
VENVPREFIX="runInVenv.sh python "
|
VENVPREFIX="runInVenv.sh python "
|
||||||
else
|
else
|
||||||
|
echo "Running in Legacy Mode"
|
||||||
export PYTHONPATH=./lib/python/
|
export PYTHONPATH=./lib/python/
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue