From c7b16cb8f1862c9d51bc8542fbc7cd10388add13 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Fri, 29 Sep 2017 10:09:30 -0400 Subject: [PATCH] jjb: lttng-analyses bt fixes Signed-off-by: Michael Jeanson --- jobs/lttng-analyses.yaml | 2 +- scripts/lttng-analyses/build.sh | 2 +- scripts/lttng-analyses/pylint.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jobs/lttng-analyses.yaml b/jobs/lttng-analyses.yaml index 910ff4b..9e558e2 100644 --- 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 a0f5e89..8d193d9 100755 --- 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 fb10d46..9475339 100755 --- 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/ -- 2.34.1