jjb: lttng-tools: Enable agents on sles

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

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index c6b0247a2bd08ad761c70ff712c395485128f82c..1eff88047577ccd53c2a9262628bf390e75d904e 100644 (file)
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -857,7 +857,7 @@
           ustversion: master
           arch: !!python/tuple [sles12sp2]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std]
+          conf: !!python/tuple [agents]
           urcuversion: !!python/tuple [master]
           babelversion: !!python/tuple [stable-1.5]
           testtype: !!python/tuple [base]
@@ -938,7 +938,7 @@
           ustversion: stable-2.12
           arch: !!python/tuple [sles12sp2]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std]
+          conf: !!python/tuple [agents]
           urcuversion: !!python/tuple [stable-0.12]
           babelversion: !!python/tuple [stable-2.0]
           testtype: !!python/tuple [base]
@@ -1019,7 +1019,7 @@
           ustversion: stable-2.11
           arch: !!python/tuple [sles12sp2]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std]
+          conf: !!python/tuple [agents]
           urcuversion: !!python/tuple [stable-0.10]
           babelversion: !!python/tuple [stable-1.5]
           testtype: !!python/tuple [base]
@@ -1100,7 +1100,7 @@
           ustversion: stable-2.10
           arch: !!python/tuple [sles12sp2]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std]
+          conf: !!python/tuple [agents]
           urcuversion: !!python/tuple [stable-0.9]
           babelversion: !!python/tuple [stable-1.5]
           testtype: !!python/tuple [base]
@@ -1161,7 +1161,7 @@
           ustversion: stable-2.9
           arch: !!python/tuple [sles12sp2]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std]
+          conf: !!python/tuple [agents]
           urcuversion: !!python/tuple [stable-0.9]
           babelversion: !!python/tuple [stable-1.5]
           testtype: !!python/tuple [base]
@@ -1173,7 +1173,7 @@
           ustversion: stable-2.8
           arch: !!python/tuple [sles12sp2]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std]
+          conf: !!python/tuple [agents]
           urcuversion: !!python/tuple [stable-0.9]
           babelversion: !!python/tuple [stable-1.5]
           testtype: !!python/tuple [base]

diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index 3da74c1afbf59ad5513e819ecfd431c8f9637c7e..054dff1b35e5dac8e8f25999e373fb11e2700059 100644 (file)
--- a/jobs/lttng-ust.yaml
+++ b/jobs/lttng-ust.yaml
@@ -334,7 +334,7 @@
           buildtype: slesbuild
           arch: !!python/tuple [sles12sp2]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std]
+          conf: !!python/tuple [agents]
           liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]
           filter: ''
       - 'lttng-ust_{version}_{buildtype}':
@@ -369,7 +369,7 @@
           version: master
           arch: !!python/tuple [sles12sp2]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std]
+          conf: !!python/tuple [agents]
           liburcu_version: !!python/tuple [stable-0.12, master]
           filter: ''
       - 'lttng-ust_{version}_{buildtype}':
@@ -409,7 +409,7 @@
           version: stable-2.12
           arch: !!python/tuple [sles12sp2]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std]
+          conf: !!python/tuple [agents]
           liburcu_version: !!python/tuple [stable-0.12, master]
           filter: ''
       - 'lttng-ust_{version}_{buildtype}':
@@ -431,7 +431,7 @@
           version: stable-2.9
           arch: !!python/tuple [sles12sp2]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std]
+          conf: !!python/tuple [agents]
           liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]
           filter: ''
 
@@ -441,7 +441,7 @@
           version: stable-2.8
           arch: !!python/tuple [sles12sp2]
           build: !!python/tuple [std]
-          conf: !!python/tuple [std]
+          conf: !!python/tuple [agents]
           liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]
           filter: ''
 

diff --git a/scripts/lttng-ust/build.sh b/scripts/lttng-ust/build.sh
index 5fc1a6d8adec1a33bf14be26d923eea78fcb6911..be9cb19da40848213e7105d81c6e0fc10afb9513 100755 (executable)
--- a/scripts/lttng-ust/build.sh
+++ b/scripts/lttng-ust/build.sh
@@ -197,7 +197,7 @@ static)
 agents)
     echo "Java and Python agents configuration"
 
-    export CLASSPATH="/usr/share/java/log4j-1.2.jar"
+    export CLASSPATH='/usr/share/java/*'
     CONF_OPTS+=("--enable-java-agent-all" "--enable-jni-interface" "--enable-python-agent")
     ;;