X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-tools.yaml;h=63da50bce8b72d67f392cf87664bdf9991c83120;hb=ee684f726f002ea0446a1af3adc8073525c6f99d;hp=de694072c1deb8ec53da13f192c52f7109b2dc20;hpb=f7512e607299ffdf83713eee970380bbeb891796;p=lttng-ci.git

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index de69407..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
@@ -548,6 +552,20 @@
     <<: *lttng-tools_builders_defaults
     <<: *lttng-tools_publishers_defaults
 
+- job-template:
+    name: 'dev_{user}_lttng-tools_{version}_macosbuild'
+    defaults: lttng-tools
+
+    wrappers:
+      - ansicolor: *lttng-tools_wrapper_ansicolor_defaults
+      - timeout: *lttng-tools_wrapper_timeout_defaults
+      - timestamps
+      - workspace-cleanup
+
+    <<: *lttng-tools_matrix_axes_defaults
+    <<: *lttng-tools_builders_defaults
+    <<: *lttng-tools_publishers_defaults
+
 - job-template:
     name: '{job_prefix}lttng-tools_{version}_long_regression'
     defaults: lttng-tools
@@ -627,6 +645,20 @@
             jobs: '{ust_job_prefix}lttng-ust_{version}_build'
             result: 'success'
 
+- job-template:
+    name: '{job_prefix}lttng-tools_{version}_macosbuild'
+    defaults: lttng-tools
+
+    wrappers:
+      - ansicolor: *lttng-tools_wrapper_ansicolor_defaults
+      - timeout: *lttng-tools_wrapper_timeout_defaults
+      - timestamps
+      - workspace-cleanup
+
+    <<: *lttng-tools_matrix_axes_defaults
+    <<: *lttng-tools_builders_defaults
+    <<: *lttng-tools_publishers_defaults
+
 - job-template:
     name: lttng-tools_{version}_winbuild
     defaults: lttng-tools
@@ -690,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
@@ -866,7 +899,7 @@
     triggers:
       - gerrit: *lttng-tools_trigger_gerrit_smoke_1
 
-    node: 'jammy-amd64'
+    node: 'deb12-amd64'
 
     builders:
       - shell:
@@ -1031,7 +1064,7 @@
           buildtype: linuxbuild
           version: master
           ustversion: master
-          platforms: !!python/tuple [jammy-amd64]
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std, oot, dist]
           confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback]
           urcuversions: !!python/tuple [master]
@@ -1093,7 +1126,7 @@
           babelversions: !!python/tuple [stable-2.0]
           filter: ''
           touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
+      - '{job_prefix}lttng-tools_{version}_macosbuild':
           buildtype: macosbuild
           version: master
           ustversion: master
@@ -1129,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
@@ -1161,7 +1194,7 @@
           buildtype: linuxbuild
           version: stable-2.13
           ustversion: stable-2.13
-          platforms: !!python/tuple [jammy-amd64]
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std, oot, dist]
           confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback]
           urcuversions: !!python/tuple [stable-0.13]
@@ -1223,7 +1256,7 @@
           babelversions: !!python/tuple [stable-2.0]
           filter: ''
           touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
+      - '{job_prefix}lttng-tools_{version}_macosbuild':
           buildtype: macosbuild
           version: stable-2.13
           ustversion: stable-2.13
@@ -1256,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
@@ -1281,7 +1314,7 @@
           buildtype: linuxbuild
           version: stable-2.12
           ustversion: stable-2.12
-          platforms: !!python/tuple [jammy-amd64]
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std, oot, dist]
           confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback]
           urcuversions: !!python/tuple [stable-0.13]
@@ -1343,7 +1376,7 @@
           babelversions: !!python/tuple [stable-2.0]
           filter: ''
           touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
+      - '{job_prefix}lttng-tools_{version}_macosbuild':
           buildtype: macosbuild
           version: stable-2.12
           ustversion: stable-2.12
@@ -1376,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
@@ -1410,7 +1443,7 @@
           buildtype: linuxbuild
           version: stable-2.11
           ustversion: stable-2.11
-          platforms: !!python/tuple [jammy-amd64]
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std, oot, dist]
           confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback]
           urcuversions: !!python/tuple [stable-0.11]
@@ -1456,7 +1489,7 @@
           buildtype: linuxbuild
           version: stable-2.10
           ustversion: stable-2.10
-          platforms: !!python/tuple [jammy-amd64]
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std, oot, dist]
           confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback]
           urcuversions: !!python/tuple [stable-0.9]
@@ -1530,7 +1563,7 @@
           babelversions: !!python/tuple [stable-1.5, master]
           filter: ''
           touchstone: ''
-      - 'dev_{user}_lttng-tools_{version}_{buildtype}':
+      - 'dev_{user}_lttng-tools_{version}_macosbuild':
           buildtype: macosbuild
           version: master-staging
           ustversion: master
@@ -1667,20 +1700,30 @@
           babelversions: !!python/tuple [stable-2.0]
           filter: ''
           touchstone: ''
+      - 'dev_review_lttng-tools_{version}_{buildtype}':
+          buildtype: linuxbuild
+          version: master
+          platforms: !!python/tuple [deb12-amd64]
+          builds: !!python/tuple [std, oot, dist, oot-dist]
+          confs: !!python/tuple [std, no-ust, agents]
+          urcuversions: !!python/tuple [stable-0.14]
+          babelversions: !!python/tuple [stable-2.0]
+          filter: ''
+          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
           buildtype: linuxbuild
-          platforms: !!python/tuple [jammy-amd64]
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [oot-dist]
           confs: !!python/tuple [agents]
           urcuversions: !!python/tuple [stable-0.14] # Baseline is stable-0.14 for C++ support
@@ -1690,7 +1733,7 @@
       - 'dev_review_lttng-tools_{version}_clang-tidy':
           version: master
           buildtype: linuxbuild
-          platforms: !!python/tuple [jammy-amd64]
+          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
@@ -1711,15 +1754,25 @@
           babelversions: !!python/tuple [stable-2.0]
           filter: ''
           touchstone: ''
+      - 'dev_review_lttng-tools_{version}_{buildtype}':
+          version: stable-2.13
+          buildtype: linuxbuild
+          platforms: !!python/tuple [deb12-amd64]
+          builds: !!python/tuple [std, oot, dist, oot-dist]
+          confs: !!python/tuple [std, no-ust, agents]
+          urcuversions: !!python/tuple [stable-0.13]
+          babelversions: !!python/tuple [stable-2.0]
+          filter: ''
+          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 ##
@@ -1733,15 +1786,25 @@
           babelversions: !!python/tuple [stable-2.0]
           filter: ''
           touchstone: ''
+      - 'dev_review_lttng-tools_{version}_{buildtype}':
+          version: stable-2.12
+          buildtype: linuxbuild
+          platforms: !!python/tuple [deb12-amd64]
+          builds: !!python/tuple [std, oot, dist, oot-dist]
+          confs: !!python/tuple [std, no-ust, agents]
+          urcuversions: !!python/tuple [stable-0.13]
+          babelversions: !!python/tuple [stable-2.0]
+          filter: ''
+          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:
@@ -1767,6 +1830,18 @@
           babelversions: !!python/tuple [master]
           filter: ''
           touchstone: ''
+      - '{job_prefix}lttng-tools_{version}_rootbuild':
+          version: master
+          buildtype: linuxbuild
+          ustversion: master
+          platforms: !!python/tuple [deb12-amd64]
+          builds: !!python/tuple [std]
+          confs: !!python/tuple [agents]
+          urcuversions: !!python/tuple [master]
+          ustversion: master
+          babelversions: !!python/tuple [master]
+          filter: '(node=="amd64-rootnode" && platform=="deb12-amd64")'
+          touchstone: ''
 
 - project:
     name: lttng-tools-views