Update lttng-analyses jobs

diff --git a/jobs/lttng-analyses.yaml b/jobs/lttng-analyses.yaml
index a47c0761cd0cbe474c71e48403dd4056af6ceb3e..4da79c75ebcd67af7dc3997a2f400ac5e5ca6028 100644 (file)
--- a/jobs/lttng-analyses.yaml
+++ b/jobs/lttng-analyses.yaml
@@ -37,6 +37,34 @@
 
 
 ## Templates
+- job-template:
+    name: lttng-analyses_{version}_build
+    defaults: lttng-analyses
+
+    project-type: matrix
+    node: 'master' # Applies only to matrix flyweight task
+    axes:
+      - axis:
+         type: slave
+         name: arch
+         values: '{obj:arch}'
+
+    builders:
+      - copyartifact:
+          project: babeltrace_master_build/arch=${{arch}},build=std,conf=python-bindings
+          which-build: last-successful
+          stable: true
+          filter: 'build/**'
+          target: 'deps/babeltrace'
+      - shell:
+         !include-raw-escape scripts/lttng-analyses/build.sh
+
+#    publishers:
+#      - archive:
+#          artifacts: 'build/**'
+#          allow-empty: false
+
+
 - job-template:
     name: lttng-analyses_{version}_pylint
     defaults: lttng-analyses
@@ -82,5 +110,7 @@
     version:
       - master
     jobs:
+      - 'lttng-analyses_{version}_build':
+          arch: !!python/tuple [x86-32, x86-64]
       - 'lttng-analyses_{version}_pylint'
 

diff --git a/scripts/lttng-analyses/build.sh b/scripts/lttng-analyses/build.sh
new file mode 100755 (executable)
index 0000000..d0509fb
--- /dev/null
+++ b/scripts/lttng-analyses/build.sh
@@ -0,0 +1,40 @@
+#!/bin/sh -exu
+#
+# Copyright (C) 2015 - Michael Jeanson <mjeanson@efficios.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+PYTHON3="python3"
+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/"
+
+PYENV_HOME=$WORKSPACE/.pyenv/
+
+# Delete previously built virtualenv
+if [ -d $PYENV_HOME ]; then
+    rm -rf $PYENV_HOME
+fi
+
+# Create virtualenv and install necessary packages
+virtualenv --system-site-packages -p $PYTHON3 $PYENV_HOME
+
+set +u
+. $PYENV_HOME/bin/activate
+set -u
+
+pip install .

diff --git a/scripts/lttng-analyses/pylint.sh b/scripts/lttng-analyses/pylint.sh
index 334cda525ffe9a0c143f43e49106d011d6e2bacc..72f47cab44f929751829c52768e7824403b09a0d 100755 (executable)
--- a/scripts/lttng-analyses/pylint.sh
+++ b/scripts/lttng-analyses/pylint.sh
@@ -15,11 +15,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+PYTHON3="python3"
+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/python3.4/dist-packages/"
+export PYTHONPATH="$BABELTRACE_DIR/lib/python${P3_VERSION}/dist-packages/"
 
 PYENV_HOME=$WORKSPACE/.pyenv/
 
@@ -29,7 +31,7 @@ if [ -d $PYENV_HOME ]; then
 fi
 
 # Create virtualenv and install necessary packages
-virtualenv --system-site-packages -p python3 $PYENV_HOME
+virtualenv --system-site-packages -p $PYTHON3 $PYENV_HOME
 
 set +u
 . $PYENV_HOME/bin/activate