jjb: lttng-analyses bt fixes

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>

diff --git a/jobs/lttng-analyses.yaml b/jobs/lttng-analyses.yaml
index 910ff4b189ed5f085c995211d54cd0c2bc3c8226..9e558e237ff97767dda678ab797f0d2ad3c2b3a7 100644 (file)
--- a/jobs/lttng-analyses.yaml
+++ b/jobs/lttng-analyses.yaml
@@ -126,7 +126,7 @@
     jobs:
       - 'lttng-analyses_{version}_build':
           arch: !!python/tuple [x86-32, x86-64]
-          babeltrace_version: !!python/tuple [stable-1.4, stable-1.5, master]
+          babeltrace_version: !!python/tuple [stable-1.5, stable-2.0, master]
       - 'lttng-analyses_{version}_pylint':
           babeltrace_version: stable-1.5
 

diff --git a/scripts/lttng-analyses/build.sh b/scripts/lttng-analyses/build.sh
index a0f5e8922adcc903ada9c0e0e1917776cffa1f90..8d193d965b3d56b4c9af3d215bf2b78728375a8a 100755 (executable)
--- a/scripts/lttng-analyses/build.sh
+++ b/scripts/lttng-analyses/build.sh
@@ -26,7 +26,7 @@ P3_VERSION=$($PYTHON3 -c "import sys;print(sys.version[:3])")
 BABELTRACE_DIR=$WORKSPACE/deps/babeltrace/build
 
 export LD_LIBRARY_PATH="$BABELTRACE_DIR/lib"
-export PYTHONPATH="$BABELTRACE_DIR/lib/python${P3_VERSION}/dist-packages/"
+export PYTHONPATH="$BABELTRACE_DIR/lib/python${P3_VERSION}/site-packages/"
 export PATH="$PATH:$BABELTRACE_DIR/bin"
 
 PYENV_HOME=$WORKSPACE/.pyenv/

diff --git a/scripts/lttng-analyses/pylint.sh b/scripts/lttng-analyses/pylint.sh
index fb10d465276764c3331ee0f220a0cb0e712005b3..9475339bba183e3da6e0cfe8da9b6cd6dc6eaef9 100755 (executable)
--- a/scripts/lttng-analyses/pylint.sh
+++ b/scripts/lttng-analyses/pylint.sh
@@ -23,7 +23,7 @@ P3_VERSION=$($PYTHON3 -c "import sys;print(sys.version[:3])")
 BABELTRACE_DIR=$WORKSPACE/deps/babeltrace/build
 
 export LD_LIBRARY_PATH="$BABELTRACE_DIR/lib"
-export PYTHONPATH="$BABELTRACE_DIR/lib/python${P3_VERSION}/dist-packages/"
+export PYTHONPATH="$BABELTRACE_DIR/lib/python${P3_VERSION}/site-packages/"
 
 PYENV_HOME=$WORKSPACE/.pyenv/