X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=jobs%2Flttng-tools.yaml;h=5ad412e044010e7aa7b4ad3d36123730329a52b7;hb=5a9325931a004f9c69427f698ccaa1f82b64419d;hp=de694072c1deb8ec53da13f192c52f7109b2dc20;hpb=f7512e607299ffdf83713eee970380bbeb891796;p=lttng-ci.git

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index de69407..5ad412e 100644
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -154,6 +154,12 @@
               ust_conf=std
               ;;
           esac
+          # Run java tests only on 'linuxbuild' jobs
+          if [ "{buildtype}" = "linuxbuild" ]; then
+            echo "LTTNG_TOOLS_RUN_UST_JAVA_TESTS=yes" >> env.properties
+          else
+            echo "LTTNG_TOOLS_RUN_UST_JAVA_TESTS=no" >> env.properties
+          fi
           echo "liburcu_conf=$liburcu_conf" >> env.properties
           echo "babeltrace_conf=$babeltrace_conf" >> env.properties
           echo "ust_conf=$ust_conf" >> env.properties
@@ -332,25 +338,10 @@
           condition-kind: strings-match
           on-evaluation-failure: run
           condition-string1: '${{platform}}'
-          condition-string2: 'msys2-mingw32'
+          condition-string2: 'msys2-ucrt64'
           steps:
             - inject:
-               properties-content: 'MSYSTEM=MINGW32'
-            - shell:
-               !include-raw-escape:
-                 - scripts/common/msys2-shebang
-                 - scripts/common/cygpath-prefix
-                 - scripts/common/print.sh
-                 - scripts/lttng-tools/build.sh
-
-      - conditional-step:
-          condition-kind: strings-match
-          on-evaluation-failure: run
-          condition-string1: '${{platform}}'
-          condition-string2: 'msys2-mingw64'
-          steps:
-            - inject:
-               properties-content: 'MSYSTEM=MINGW64'
+               properties-content: 'MSYSTEM=UCRT64'
             - shell:
                !include-raw-escape:
                  - scripts/common/msys2-shebang
@@ -452,6 +443,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 +543,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
@@ -600,7 +609,7 @@
     triggers:
       - pollscm: *lttng-tools_trigger_pollscm_default
       - reverse:
-            jobs: '{ust_job_prefix}lttng-ust_{version}_build'
+            jobs: '{ust_job_prefix}lttng-ust_{version}_{buildtype}'
             result: 'success'
 
 - job-template:
@@ -624,9 +633,23 @@
     triggers:
       - pollscm: *lttng-tools_trigger_pollscm_default
       - reverse:
-            jobs: '{ust_job_prefix}lttng-ust_{version}_build'
+            jobs: '{ust_job_prefix}lttng-ust_{version}_{buildtype}'
             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 +713,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 +890,7 @@
     triggers:
       - gerrit: *lttng-tools_trigger_gerrit_smoke_1
 
-    node: 'jammy-amd64'
+    node: 'deb12-amd64'
 
     builders:
       - shell:
@@ -886,7 +910,7 @@
 - job-template:
     name: lttng-tools_{version}_release
     defaults: lttng-tools
-    node: 'bionic-amd64'
+    node: 'deb12-amd64'
 
     triggers:
       - pollscm:
@@ -905,13 +929,13 @@
     builders:
       - copyartifact:
           <<: *lttng-tools_steps_copyartifact_defaults
-          project: 'liburcu_{urcuversion}_build/platform=bionic-amd64,conf=std,build=std'
+          project: 'liburcu_{urcuversion}_linuxbuild/platform=deb12-amd64,conf=std,build=std'
       - copyartifact:
           <<: *lttng-tools_steps_copyartifact_defaults
-          project: 'babeltrace_{babelversion}_build/platform=bionic-amd64,conf=std,build=std'
+          project: 'babeltrace_{babelversion}_linuxbuild/platform=deb12-amd64,conf=std,build=std'
       - copyartifact:
           <<: *lttng-tools_steps_copyartifact_defaults
-          project: 'lttng-ust_{ustversion}_build/liburcu_version={urcuversion},platform=bionic-amd64,conf=agents,build=std'
+          project: 'lttng-ust_{ustversion}_linuxbuild/liburcu_version={urcuversion},platform=deb12-amd64,conf=agents,build=std'
       - shell:
           !include-raw-escape: scripts/lttng-tools/prebuild_clean_processes_coredumps.sh
       - shell:
@@ -944,7 +968,7 @@
 - job-template:
     name: lttng-tools_{version}_scan-build
     defaults: lttng-tools
-    node: 'bionic-amd64'
+    node: 'deb12-amd64'
 
     triggers:
       - pollscm:
@@ -953,10 +977,10 @@
     builders:
       - copyartifact:
           <<: *lttng-tools_steps_copyartifact_defaults
-          project: 'liburcu_{urcuversion}_build/platform=bionic-amd64,conf=std,build=std'
+          project: 'liburcu_{urcuversion}_linuxbuild/platform=deb12-amd64,conf=std,build=std'
       - copyartifact:
           <<: *lttng-tools_steps_copyartifact_defaults
-          project: 'lttng-ust_{ustversion}_build/liburcu_version={urcuversion},platform=bionic-amd64,conf=std,build=std'
+          project: 'lttng-ust_{ustversion}_linuxbuild/liburcu_version={urcuversion},platform=deb12-amd64,conf=std,build=std'
       - shell:
           !include-raw-escape: scripts/common/scan-build.sh
 
@@ -970,7 +994,7 @@
 - job-template:
     name: lttng-tools_{version}_coverity
     defaults: lttng-tools
-    node: 'bionic-amd64'
+    node: 'deb12-amd64'
 
     triggers:
       - pollscm:
@@ -990,10 +1014,10 @@
     builders:
       - copyartifact:
           <<: *lttng-tools_steps_copyartifact_defaults
-          project: 'liburcu_{urcuversion}_build/platform=bionic-amd64,conf=std,build=std'
+          project: 'liburcu_{urcuversion}_linuxbuild/platform=deb12-amd64,conf=std,build=std'
       - copyartifact:
           <<: *lttng-tools_steps_copyartifact_defaults
-          project: 'lttng-ust_{ustversion}_build/liburcu_version={urcuversion},platform=bionic-amd64,conf=std,build=std'
+          project: 'lttng-ust_{ustversion}_linuxbuild/liburcu_version={urcuversion},platform=deb12-amd64,conf=std,build=std'
       - shell:
           !include-raw-escape: scripts/common/coverity.sh
 
@@ -1009,7 +1033,7 @@
 - view-template:
     name: 'LTTng-tools'
     view-type: list
-    regex: 'lttng-tools[-_].*'
+    regex: 'lttng-(docs|tools)[-_].*'
 
 
 ## Projects
@@ -1031,18 +1055,7 @@
           buildtype: linuxbuild
           version: master
           ustversion: master
-          platforms: !!python/tuple [jammy-amd64]
-          builds: !!python/tuple [std, oot, dist]
-          confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback]
-          urcuversions: !!python/tuple [master]
-          babelversions: !!python/tuple [stable-2.0, master]
-          filter: '(build=="std") || ((babeltrace_version=="master" && (conf=="std" || conf=="agents" || conf=="no-ust")))'
-          touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: build
-          version: master
-          ustversion: master
-          platforms: !!python/tuple [bionic-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,11 +1106,11 @@
           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
-          platforms: !!python/tuple [macos-amd64, macos-arm64]
+          platforms: !!python/tuple [macos-arm64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [relayd-only]
           urcuversions: !!python/tuple [master]
@@ -1115,10 +1128,10 @@
           filter: ''
           touchstone: ''
       - '{job_prefix}lttng-tools_{version}_long_regression':
-          buildtype: build
+          buildtype: linuxbuild
           version: master
           ustversion: master
-          platforms: !!python/tuple [bionic-amd64]
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           urcuversions: !!python/tuple [master]
@@ -1126,15 +1139,15 @@
           filter: ''
           touchstone: ''
       - '{job_prefix}lttng-tools_{version}_rootbuild':
-          buildtype: build
+          buildtype: linuxbuild
           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,18 +1174,7 @@
           buildtype: linuxbuild
           version: stable-2.13
           ustversion: stable-2.13
-          platforms: !!python/tuple [jammy-amd64]
-          builds: !!python/tuple [std, oot, dist]
-          confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback]
-          urcuversions: !!python/tuple [stable-0.13]
-          babelversions: !!python/tuple [stable-2.0]
-          filter: '(build=="std") || ((babeltrace_version=="stable-2.0" && (conf=="std" || conf=="agents" || conf=="no-ust")))'
-          touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: build
-          version: stable-2.13
-          ustversion: stable-2.13
-          platforms: !!python/tuple [bionic-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,11 +1225,11 @@
           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
-          platforms: !!python/tuple [macos-amd64, macos-arm64]
+          platforms: !!python/tuple [macos-arm64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [relayd-only]
           urcuversions: !!python/tuple [stable-0.13]
@@ -1245,10 +1247,10 @@
           filter: ''
           touchstone: ''
       - '{job_prefix}lttng-tools_{version}_long_regression':
-          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 [std]
           urcuversions: !!python/tuple [stable-0.13]
@@ -1256,15 +1258,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,18 +1283,7 @@
           buildtype: linuxbuild
           version: stable-2.12
           ustversion: stable-2.12
-          platforms: !!python/tuple [jammy-amd64]
-          builds: !!python/tuple [std, oot, dist]
-          confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback]
-          urcuversions: !!python/tuple [stable-0.13]
-          babelversions: !!python/tuple [stable-2.0]
-          filter: '(build=="std") || ((babeltrace_version=="stable-2.0" && (conf=="std" || conf=="agents" || conf=="no-ust")))'
-          touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: build
-          version: stable-2.12
-          ustversion: stable-2.12
-          platforms: !!python/tuple [bionic-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,11 +1334,11 @@
           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
-          platforms: !!python/tuple [macos-amd64, macos-arm64]
+          platforms: !!python/tuple [macos-arm64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [relayd-only]
           urcuversions: !!python/tuple [stable-0.13]
@@ -1365,10 +1356,10 @@
           filter: ''
           touchstone: ''
       - '{job_prefix}lttng-tools_{version}_long_regression':
-          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 [std]
           urcuversions: !!python/tuple [stable-0.13]
@@ -1376,15 +1367,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-linux5" && platform=="deb12-amd64")'
           touchstone: ''
       - 'lttng-tools_{version}_release':
           version: v2.12
@@ -1396,107 +1387,6 @@
           urcuversion: stable-0.13
           ustversion: stable-2.12
 
-- project:
-    name: dev_upstream_lttng-tools
-    job_prefix: 'dev_upstream_'
-    ust_job_prefix: 'dev_upstream_'
-    urcu_job_prefix: 'dev_upstream_'
-    bt_job_prefix: 'dev_upstream_'
-    github_user: lttng
-    email_to: 'ci-notification@lists.lttng.org, cc:jgalar@efficios.com'
-    jobs:
-      # stable-2.11
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: linuxbuild
-          version: stable-2.11
-          ustversion: stable-2.11
-          platforms: !!python/tuple [jammy-amd64]
-          builds: !!python/tuple [std, oot, dist]
-          confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback]
-          urcuversions: !!python/tuple [stable-0.11]
-          babelversions: !!python/tuple [stable-1.5]
-          filter: '(build=="std") || (conf=="std" || conf=="agents" || conf=="no-ust")'
-          touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: portbuild
-          version: stable-2.11
-          ustversion: stable-2.11
-          platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb12-i386]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [no-ust, agents]
-          urcuversions: !!python/tuple [stable-0.11]
-          babelversions: !!python/tuple [stable-1.5]
-          filter: ''
-          touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: slesbuild
-          version: stable-2.11
-          ustversion: stable-2.11
-          platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [agents]
-          urcuversions: !!python/tuple [stable-0.11]
-          babelversions: !!python/tuple [stable-1.5]
-          filter: ''
-          touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: elbuild
-          version: stable-2.11
-          ustversion: stable-2.11
-          platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [std]
-          urcuversions: !!python/tuple [stable-0.11]
-          babelversions: !!python/tuple [stable-1.5]
-          filter: ''
-          touchstone: ''
-
-      # stable-2.10
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: linuxbuild
-          version: stable-2.10
-          ustversion: stable-2.10
-          platforms: !!python/tuple [jammy-amd64]
-          builds: !!python/tuple [std, oot, dist]
-          confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback]
-          urcuversions: !!python/tuple [stable-0.9]
-          babelversions: !!python/tuple [stable-1.5]
-          filter: '(build=="std") || (conf=="std" || conf=="agents" || conf=="no-ust")'
-          touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: portbuild
-          version: stable-2.10
-          ustversion: stable-2.10
-          platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb12-i386]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [no-ust, agents]
-          urcuversions: !!python/tuple [stable-0.9]
-          babelversions: !!python/tuple [stable-1.5]
-          filter: ''
-          touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: slesbuild
-          version: stable-2.10
-          ustversion: stable-2.10
-          platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [agents]
-          urcuversions: !!python/tuple [stable-0.9]
-          babelversions: !!python/tuple [stable-1.5]
-          filter: ''
-          touchstone: ''
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: elbuild
-          version: stable-2.10
-          ustversion: stable-2.10
-          platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [std]
-          urcuversions: !!python/tuple [stable-0.9]
-          babelversions: !!python/tuple [stable-1.5]
-          filter: ''
-          touchstone: ''
-
 - project:
     name: dev_jgalar_lttng-tools
     job_prefix: 'dev_jgalar_'
@@ -1509,10 +1399,10 @@
     jobs:
       # Master
       - 'dev_{user}_lttng-tools_{version}_{buildtype}':
-          buildtype: build
+          buildtype: linuxbuild
           version: master-staging
           ustversion: master
-          platforms: !!python/tuple [bionic-amd64]
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std, oot, dist]
           confs: !!python/tuple [std, no-ust, agents]
           urcuversions: !!python/tuple [master]
@@ -1530,11 +1420,11 @@
           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
-          platforms: !!python/tuple [macos-amd64, macos-arm64]
+          platforms: !!python/tuple [macos-arm64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [relayd-only]
           urcuversions: !!python/tuple [master]
@@ -1544,10 +1434,10 @@
 
       # stable-2.13
       - 'dev_{user}_lttng-tools_{version}_{buildtype}':
-          buildtype: build
+          buildtype: linuxbuild
           version: stable-2.13-staging
           ustversion: stable-2.13
-          platforms: !!python/tuple [bionic-amd64]
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std, oot, dist]
           confs: !!python/tuple [std, no-ust, agents]
           urcuversions: !!python/tuple [stable-0.13]
@@ -1568,10 +1458,10 @@
 
       # stable-2.12
       - 'dev_{user}_lttng-tools_{version}_{buildtype}':
-          buildtype: build
+          buildtype: linuxbuild
           version: stable-2.12-staging
           ustversion: stable-2.12
-          platforms: !!python/tuple [bionic-amd64]
+          platforms: !!python/tuple [deb12-amd64]
           builds: !!python/tuple [std, oot, dist]
           confs: !!python/tuple [std, no-ust, agents]
           urcuversions: !!python/tuple [stable-0.13]
@@ -1590,64 +1480,6 @@
           filter: ''
           touchstone: ''
 
-- project:
-    name: dev_jgalar_lttng-tools-upstream
-    job_prefix: 'dev_jgalar_'
-    ust_job_prefix: 'dev_upstream_'
-    urcu_job_prefix: 'dev_upstream_'
-    bt_job_prefix: 'dev_upstream_'
-    user: jgalar
-    github_user: jgalar
-    email_to: 'jgalar@efficios.com'
-    jobs:
-      # stable-2.11
-      - 'dev_{user}_lttng-tools_{version}_{buildtype}':
-          buildtype: build
-          version: stable-2.11-staging
-          ustversion: stable-2.11
-          platforms: !!python/tuple [bionic-amd64]
-          builds: !!python/tuple [std, oot, dist]
-          confs: !!python/tuple [std, no-ust, agents]
-          urcuversions: !!python/tuple [stable-0.11]
-          babelversions: !!python/tuple [stable-1.5]
-          filter: ''
-          touchstone: ''
-      - 'dev_{user}_lttng-tools_{version}_{buildtype}':
-          buildtype: portbuild
-          version: stable-2.11-staging
-          ustversion: stable-2.11
-          platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb12-i386]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [std, no-ust, agents]
-          urcuversions: !!python/tuple [stable-0.11]
-          babelversions: !!python/tuple [stable-1.5]
-          filter: ''
-          touchstone: ''
-
-      # stable-2.10
-      - 'dev_{user}_lttng-tools_{version}_{buildtype}':
-          buildtype: build
-          version: stable-2.10-staging
-          ustversion: stable-2.10
-          platforms: !!python/tuple [bionic-amd64]
-          builds: !!python/tuple [std, oot, dist]
-          confs: !!python/tuple [std, no-ust, agents]
-          urcuversions: !!python/tuple [stable-0.9]
-          babelversions: !!python/tuple [stable-1.5]
-          filter: ''
-          touchstone: ''
-      - 'dev_{user}_lttng-tools_{version}_{buildtype}':
-          buildtype: portbuild
-          version: stable-2.10-staging
-          ustversion: stable-2.10
-          platforms: !!python/tuple [deb12-armhf, deb12-arm64, deb12-ppc64el, deb12-i386]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [std, no-ust, agents]
-          urcuversions: !!python/tuple [stable-0.9]
-          babelversions: !!python/tuple [stable-1.5]
-          filter: ''
-          touchstone: ''
-
 - project:
     name: review-lttng-tools
     job_prefix: ''
@@ -1659,8 +1491,8 @@
     ## Master ##
       - 'dev_review_lttng-tools_{version}_{buildtype}':
           version: master
-          buildtype: build
-          platforms: !!python/tuple [bionic-amd64]
+          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.14] # Baseline is stable-0.14 for C++ support
@@ -1669,18 +1501,18 @@
           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 +1522,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
@@ -1703,8 +1535,8 @@
     ## Stable 2.13 ##
       - 'dev_review_lttng-tools_{version}_{buildtype}':
           version: stable-2.13
-          buildtype: build
-          platforms: !!python/tuple [bionic-amd64]
+          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]
@@ -1713,20 +1545,20 @@
           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 ##
       - 'dev_review_lttng-tools_{version}_{buildtype}':
           version: stable-2.12
-          buildtype: build
-          platforms: !!python/tuple [bionic-amd64]
+          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]
@@ -1735,38 +1567,15 @@
           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-linux5" && platform=="deb12-amd64")'
           touchstone: ''
 
-- project:
-    name: lttng-tools-mjeanson
-    job_prefix: 'dev_mjeanson_'
-    ust_job_prefix: 'dev_mjeanson_'
-    urcu_job_prefix: 'dev_mjeanson_'
-    bt_job_prefix: 'dev_mjeanson_'
-    github_user: lttng
-    github_name: lttng-tools
-    email_to: "mjeanson@efficios.com"
-    version:
-      - master
-    jobs:
-      - '{job_prefix}lttng-tools_{version}_{buildtype}':
-          buildtype: portbuild
-          version: master
-          ustversion: master
-          platforms: !!python/tuple [sid-riscv64]
-          builds: !!python/tuple [std]
-          confs: !!python/tuple [std, no-ust, agents]
-          urcuversions: !!python/tuple [master]
-          babelversions: !!python/tuple [master]
-          filter: ''
-          touchstone: ''
 
 - project:
     name: lttng-tools-views