X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-tools.yaml;h=30ac64ab88fa23f2a61397d9225e2337f121c988;hb=487bce20ad245559558be282363546914e10910a;hp=4a4b60de035661d2bbd1e4039a05aae54efc87d2;hpb=fbeb28ab3fd24407e6256413d59ad2292723c150;p=lttng-ci.git

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 4a4b60d..30ac64a 100644
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -163,6 +163,9 @@
           fi
           if [ "{buildtype}" = "slesbuild" ] ; then
             echo "TAP_AUTOTIME=0" >> env.properties
+            echo "LTTNG_TESTS_TAP_AUTOTIME=0" >> env.properties
+            # On SLES, force log4j to 2.17.1
+            echo "LTTNG_TOOLS_UST_JAVA_TESTS_LOG4J_API_VERSION=2.17.1" >> env.properties
           fi
           echo "liburcu_conf=$liburcu_conf" >> env.properties
           echo "babeltrace_conf=$babeltrace_conf" >> env.properties
@@ -227,6 +230,7 @@
           fi
           if [ "{buildtype}" = "slesbuild" ] ; then
             echo "TAP_AUTOTIME=0" >> env.properties
+            echo "LTTNG_TESTS_TAP_AUTOTIME=0" >> env.properties
           fi
       - inject:
           properties-file: env.properties
@@ -1050,6 +1054,9 @@
       - copyartifact:
           <<: *lttng-tools_steps_copyartifact_defaults
           project: 'liburcu_{urcuversion}_linuxbuild/platform=deb12-amd64,conf=std,build=std'
+      - copyartifact:
+          <<: *lttng-tools_steps_copyartifact_defaults
+          project: 'babeltrace_{babelversion}_linuxbuild/platform=deb12-amd64,conf=std,build=std'
       - copyartifact:
           <<: *lttng-tools_steps_copyartifact_defaults
           project: 'lttng-ust_{ustversion}_linuxbuild/liburcu_version={urcuversion},platform=deb12-amd64,conf=std,build=std'
@@ -1087,6 +1094,9 @@
       - copyartifact:
           <<: *lttng-tools_steps_copyartifact_defaults
           project: 'liburcu_{urcuversion}_linuxbuild/platform=deb12-amd64,conf=std,build=std'
+      - copyartifact:
+          <<: *lttng-tools_steps_copyartifact_defaults
+          project: 'babeltrace_{babelversion}_linuxbuild/platform=deb12-amd64,conf=std,build=std'
       - copyartifact:
           <<: *lttng-tools_steps_copyartifact_defaults
           project: 'lttng-ust_{ustversion}_linuxbuild/liburcu_version={urcuversion},platform=deb12-amd64,conf=std,build=std'
@@ -1258,10 +1268,12 @@
           version: master
           urcuversion: master
           ustversion: master
+          babelversion: master
       - 'lttng-tools_{version}_coverity':
           version: master
           urcuversion: master
           ustversion: master
+          babelversion: master
 
       # stable-2.13
       - '{job_prefix}lttng-tools_{version}_{buildtype}':
@@ -1393,6 +1405,7 @@
           version: stable-2.13
           urcuversion: stable-0.13
           ustversion: stable-2.13
+          babelversion: stable-2.0
 
       # stable-2.12
       - '{job_prefix}lttng-tools_{version}_{buildtype}':
@@ -1524,6 +1537,7 @@
           version: stable-2.12
           urcuversion: stable-0.13
           ustversion: stable-2.12
+          babelversion: stable-2.0
 
 - project:
     name: dev_jgalar_lttng-tools