X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=jobs%2Flttng-tools.yaml;h=63da50bce8b72d67f392cf87664bdf9991c83120;hb=732698e982b146987ab598bb595b910978e8e381;hp=cf0eacb386ce2736721033ae844ca166f4fe573c;hpb=dc98b48ab638339a47b89f80bdb9a734d68b8846;p=lttng-ci.git

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index cf0eacb..63da50b 100644
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -452,6 +452,10 @@
               <scm/>
             </io.jenkins.plugins.analysis.core.steps.IssuesRecorder>
 
+      - junit: &lttng-tools_publisher_junit_defaults
+          results: 'src/lttng-ust-java-tests/**/target/failsafe-reports/*.xml'
+          allow-empty-results: true
+
       - archive: &lttng-tools_publisher_archive_defaults
           artifacts: 'build/**,deps/**,tap/**,log/**'
           follow-symlinks: true
@@ -718,6 +722,7 @@
 
       - tap: *lttng-tools_publisher_tap_defaults
       - raw: *lttng-tools_publisher_warnings-ng_defaults
+      - junit: *lttng-tools_publisher_junit_defaults
       - archive: *lttng-tools_publisher_archive_defaults
       - workspace-cleanup: *lttng-tools_publisher_workspace-cleanup_defaults
       - raw: *lttng-tools_publisher_proc-cleaner_defaults
@@ -1157,12 +1162,12 @@
           buildtype: build
           version: master
           ustversion: master
-          platforms: !!python/tuple [bionic-amd64]
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           urcuversions: !!python/tuple [master]
           babelversions: !!python/tuple [stable-2.0]
-          filter: '(node=="amd64-rootnode" && platform=="bionic-amd64")'
+          filter: '(node=="amd64-rootnode" && platform=="deb12-amd64")'
           touchstone: ''
       - '{job_prefix}lttng-tools_{version}_rootbuild_i386':
           buildtype: portbuild
@@ -1284,15 +1289,15 @@
           filter: ''
           touchstone: ''
       - '{job_prefix}lttng-tools_{version}_rootbuild':
-          buildtype: build
+          buildtype: linuxbuild
           version: stable-2.13
           ustversion: stable-2.13
-          platforms: !!python/tuple [bionic-amd64]
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           urcuversions: !!python/tuple [stable-0.13]
           babelversions: !!python/tuple [stable-2.0]
-          filter: '(node=="amd64-rootnode" && platform=="bionic-amd64")'
+          filter: '(node=="amd64-rootnode" && platform=="deb12-amd64")'
           touchstone: ''
       - 'lttng-tools_{version}_release':
           version: v2.13
@@ -1404,15 +1409,15 @@
           filter: ''
           touchstone: ''
       - '{job_prefix}lttng-tools_{version}_rootbuild':
-          buildtype: build
+          buildtype: linuxbuild
           version: stable-2.12
           ustversion: stable-2.12
-          platforms: !!python/tuple [bionic-amd64]
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           urcuversions: !!python/tuple [stable-0.13]
           babelversions: !!python/tuple [stable-2.0]
-          filter: '(node=="amd64-rootnode" && platform=="bionic-amd64")'
+          filter: '(node=="amd64-rootnode" && platform=="deb12-amd64")'
           touchstone: ''
       - 'lttng-tools_{version}_release':
           version: v2.12
@@ -1707,13 +1712,13 @@
           touchstone: ''
       - 'dev_review_lttng-tools_{version}_rootbuild':
           version: master
-          buildtype: build
-          platforms: !!python/tuple [bionic-amd64]
+          buildtype: linuxbuild
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           urcuversions: !!python/tuple [stable-0.14] # Baseline is stable-0.14 for C++ support
           babelversions: !!python/tuple [stable-2.0]
-          filter: '(node=="amd64-rootnode" && platform=="bionic-amd64")'
+          filter: '(node=="amd64-rootnode" && platform=="deb12-amd64")'
           touchstone: ''
       - 'dev_review_lttng-tools_{version}_smokebuild':
           version: master
@@ -1761,13 +1766,13 @@
           touchstone: ''
       - 'dev_review_lttng-tools_{version}_rootbuild':
           version: stable-2.13
-          buildtype: build
-          platforms: !!python/tuple [bionic-amd64]
+          buildtype: linuxbuild
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           urcuversions: !!python/tuple [stable-0.13]
           babelversions: !!python/tuple [stable-2.0]
-          filter: '(node=="amd64-rootnode" && platform=="bionic-amd64")'
+          filter: '(node=="amd64-rootnode" && platform=="deb12-amd64")'
           touchstone: ''
 
     ## Stable 2.12 ##
@@ -1793,13 +1798,13 @@
           touchstone: ''
       - 'dev_review_lttng-tools_{version}_rootbuild':
           version: stable-2.12
-          buildtype: build
-          platforms: !!python/tuple [bionic-amd64]
+          buildtype: linuxbuild
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           urcuversions: !!python/tuple [stable-0.13]
           babelversions: !!python/tuple [stable-2.0]
-          filter: '(node=="amd64-rootnode" && platform=="bionic-amd64")'
+          filter: '(node=="amd64-rootnode" && platform=="deb12-amd64")'
           touchstone: ''
 
 - project:
@@ -1827,7 +1832,7 @@
           touchstone: ''
       - '{job_prefix}lttng-tools_{version}_rootbuild':
           version: master
-          buildtype: build
+          buildtype: linuxbuild
           ustversion: master
           platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std]
@@ -1835,7 +1840,7 @@
           urcuversions: !!python/tuple [master]
           ustversion: master
           babelversions: !!python/tuple [master]
-          filter: '(node=="deb12-amd64-rootnode" && platform=="deb12-amd64")'
+          filter: '(node=="amd64-rootnode" && platform=="deb12-amd64")'
           touchstone: ''
 
 - project: