X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-tools.yaml;h=024c8bb4bdd16f3d12f18d3ab2ee877711275016;hb=aa83d68e92c14c35e1750115baad6c9d3bdc2428;hp=3e3d58fb1a4af0d0445d02a216a14d28a0b3e803;hpb=eba6297c0fc1194fbf737caadd69b85a5512467f;p=lttng-ci.git

diff --git a/jobs/lttng-tools.yaml b/jobs/lttng-tools.yaml
index 3e3d58f..024c8bb 100644
--- a/jobs/lttng-tools.yaml
+++ b/jobs/lttng-tools.yaml
@@ -71,10 +71,10 @@
         expr: '{touchstone}'
         result: unstable
     axes:
-      - axis: &lttng-tools_matrix_axis_arch
+      - axis: &lttng-tools_matrix_axis_platform
          type: slave
-         name: arch
-         values: '{obj:archs}'
+         name: platform
+         values: '{obj:platforms}'
       - axis: &lttng-tools_matrix_axis_conf
          type: user-defined
          name: conf
@@ -107,8 +107,9 @@
          name: node
          values:
            - 'amd64-rootnode'
+           - 'i386-rootnode'
       - axis:
-          <<: *lttng-tools_matrix_axis_arch
+          <<: *lttng-tools_matrix_axis_platform
           type: user-defined
       - axis: *lttng-tools_matrix_axis_conf
       - axis: *lttng-tools_matrix_axis_build
@@ -159,12 +160,12 @@
       # Always copy liburcu artifacts
       - copyartifact:
           <<: *lttng-tools_steps_copyartifact_defaults
-          project: '{urcu_job_prefix}liburcu_${{liburcu_version}}_{buildtype}/arch=${{arch}},conf=${{liburcu_conf}},build=std'
+          project: '{urcu_job_prefix}liburcu_${{liburcu_version}}_{buildtype}/platform=${{platform}},conf=${{liburcu_conf}},build=std'
 
       # Always copy babeltrace artifacts
       - copyartifact:
           <<: *lttng-tools_steps_copyartifact_defaults
-          project: '{bt_job_prefix}babeltrace_${{babeltrace_version}}_{buildtype}/arch=${{arch}},conf=${{babeltrace_conf}},build=std'
+          project: '{bt_job_prefix}babeltrace_${{babeltrace_version}}_{buildtype}/platform=${{platform}},conf=${{babeltrace_conf}},build=std'
 
       # Some conf do not require lttng-ust artifacts
       - conditional-step:
@@ -176,7 +177,7 @@
           steps:
             - copyartifact:
                 <<: *lttng-tools_steps_copyartifact_defaults
-                project: '{ust_job_prefix}lttng-ust_{ustversion}_{buildtype}/liburcu_version=${{liburcu_version}},arch=${{arch}},conf=${{ust_conf}},build=std'
+                project: '{ust_job_prefix}lttng-ust_{ustversion}_{buildtype}/liburcu_version=${{liburcu_version}},platform=${{platform}},conf=${{ust_conf}},build=std'
 
       # rootbuild requires a checkout of modules
       - conditional-step:
@@ -215,7 +216,7 @@
             - shell: |
                 #!/bin/bash
                 set -exu
-                git clone -b "&GERRIT_BRANCH" https://github.com/{github_user}/lttng-modules.git src/lttng-modules
+                git clone -b "$GERRIT_BRANCH" https://github.com/{github_user}/lttng-modules.git src/lttng-modules
 
       # Copy lttng-ust artifacts if the conf is 'std' or 'agents'
       # and we don't depend on a specific lttng-ust change
@@ -231,7 +232,7 @@
           steps:
             - copyartifact:
                 <<: *lttng-tools_steps_copyartifact_defaults
-                project: '{ust_job_prefix}lttng-ust_${{GERRIT_BRANCH}}_{buildtype}/liburcu_version=${{liburcu_version}},arch=${{arch}},conf=${{conf}},build=std'
+                project: '{ust_job_prefix}lttng-ust_${{GERRIT_BRANCH}}_{buildtype}/liburcu_version=${{liburcu_version}},platform=${{platform}},conf=${{conf}},build=std'
 
       # Copy liburcu artifacts if we don't depend on a specific liburcu change
       - conditional-step:
@@ -241,7 +242,7 @@
           steps:
             - copyartifact:
                 <<: *lttng-tools_steps_copyartifact_defaults
-                project: '{urcu_job_prefix}liburcu_${{liburcu_version}}_{buildtype}/arch=${{arch}},conf=std,build=std'
+                project: '{urcu_job_prefix}liburcu_${{liburcu_version}}_{buildtype}/platform=${{platform}},conf=std,build=std'
 
       # Copy babeltrace artifacts if we don't depend on a specific babeltrace change
       - conditional-step:
@@ -251,7 +252,7 @@
           steps:
             - copyartifact:
                 <<: *lttng-tools_steps_copyartifact_defaults
-                project: '{bt_job_prefix}babeltrace_${{babeltrace_version}}_{buildtype}/arch=${{arch}},conf=std,build=std'
+                project: '{bt_job_prefix}babeltrace_${{babeltrace_version}}_{buildtype}/platform=${{platform}},conf=std,build=std'
 
       - shell:
          !include-raw-escape: scripts/lttng-tools/clean_processes_coredump.sh
@@ -307,12 +308,12 @@
       # Always copy liburcu artifacts
       - copyartifact:
           <<: *lttng-tools_steps_copyartifact_defaults
-          project: '{urcu_job_prefix}liburcu_${{liburcu_version}}_winbuild/arch=${{arch}},conf=std,build=std'
+          project: '{urcu_job_prefix}liburcu_${{liburcu_version}}_winbuild/platform=${{platform}},conf=std,build=std'
 
       - conditional-step:
           condition-kind: strings-match
           on-evaluation-failure: run
-          condition-string1: '${{arch}}'
+          condition-string1: '${{platform}}'
           condition-string2: 'cygwin64'
           steps:
             - shell:
@@ -325,7 +326,7 @@
       - conditional-step:
           condition-kind: strings-match
           on-evaluation-failure: run
-          condition-string1: '${{arch}}'
+          condition-string1: '${{platform}}'
           condition-string2: 'msys2-mingw32'
           steps:
             - inject:
@@ -340,7 +341,7 @@
       - conditional-step:
           condition-kind: strings-match
           on-evaluation-failure: run
-          condition-string1: '${{arch}}'
+          condition-string1: '${{platform}}'
           condition-string2: 'msys2-mingw64'
           steps:
             - inject:
@@ -384,6 +385,8 @@
           results: 'tap/**/*.*'
           fail-if-no-results: true
           failed-tests-mark-build-as-failure: true
+          include-comment-diagnostics: true
+          output-tap-to-console: false
           todo-is-failure: false
 
       - raw: &lttng-tools_publisher_warnings-ng_defaults
@@ -398,14 +401,6 @@
                   <reportEncoding/>
                   <skipSymbolicLinks>false</skipSymbolicLinks>
                 </io.jenkins.plugins.analysis.warnings.Gcc4>
-                <io.jenkins.plugins.analysis.warnings.Clang>
-                  <id/>
-                  <name/>
-                  <jenkins plugin="plugin-util-api"/>
-                  <pattern/>
-                  <reportEncoding/>
-                  <skipSymbolicLinks>false</skipSymbolicLinks>
-                </io.jenkins.plugins.analysis.warnings.Clang>
               </analysisTools>
               <sourceCodeEncoding/>
               <sourceDirectory/>
@@ -436,7 +431,7 @@
             </io.jenkins.plugins.analysis.core.steps.IssuesRecorder>
 
       - archive: &lttng-tools_publisher_archive_defaults
-          artifacts: 'build/**,deps/**,tap/**'
+          artifacts: 'build/**,deps/**,tap/**,log/**'
           allow-empty: false
 
       - workspace-cleanup: &lttng-tools_publisher_workspace-cleanup_defaults
@@ -544,6 +539,30 @@
             jobs: '{ust_job_prefix}lttng-ust_{version}_build'
             result: 'success'
 
+- job-template:
+    name: '{job_prefix}lttng-tools_{version}_rootbuild_i386'
+    defaults: lttng-tools
+
+    scm:
+      - git: *lttng-tools_scm_git_default
+
+    wrappers:
+      - ansicolor: *lttng-tools_wrapper_ansicolor_defaults
+      - timeout:
+          <<: *lttng-tools_wrapper_timeout_defaults
+          timeout: 10
+      - timestamps
+
+    <<: *lttng-tools_matrix_axes_rootbuild
+    <<: *lttng-tools_builders_defaults
+    <<: *lttng-tools_publishers_defaults
+
+    triggers:
+      - pollscm: *lttng-tools_trigger_pollscm_default
+      - reverse:
+            jobs: '{ust_job_prefix}lttng-ust_{version}_build'
+            result: 'success'
+
 - job-template:
     name: lttng-tools_{version}_winbuild
     defaults: lttng-tools
@@ -657,7 +676,7 @@
 - job-template:
     name: lttng-tools_{version}_release
     defaults: lttng-tools
-    node: 'amd64'
+    node: 'bionic-amd64'
 
     triggers:
       - pollscm:
@@ -676,13 +695,13 @@
     builders:
       - copyartifact:
           <<: *lttng-tools_steps_copyartifact_defaults
-          project: 'liburcu_{urcuversion}_build/arch=amd64,conf=std,build=std'
+          project: 'liburcu_{urcuversion}_build/platform=bionic-amd64,conf=std,build=std'
       - copyartifact:
           <<: *lttng-tools_steps_copyartifact_defaults
-          project: 'babeltrace_{babelversion}_build/arch=amd64,conf=std,build=std'
+          project: 'babeltrace_{babelversion}_build/platform=bionic-amd64,conf=std,build=std'
       - copyartifact:
           <<: *lttng-tools_steps_copyartifact_defaults
-          project: 'lttng-ust_{ustversion}_build/liburcu_version={urcuversion},arch=amd64,conf=agents,build=std'
+          project: 'lttng-ust_{ustversion}_build/liburcu_version={urcuversion},platform=bionic-amd64,conf=agents,build=std'
       - shell:
           !include-raw-escape: scripts/lttng-tools/clean_processes_coredump.sh
       - shell:
@@ -718,33 +737,13 @@
       - archive:
           artifacts: 'out/**'
           allow-empty: false
+          fingerprint: true
       - workspace-cleanup: *lttng-tools_publisher_workspace-cleanup_defaults
 
-- job-template:
-    name: lttng-tools_{version}_cppcheck
-    defaults: lttng-tools
-
-    triggers:
-      - pollscm:
-          cron: "@daily"
-
-    builders:
-      - shell: |
-          rm -f cppcheck-result.xml
-          cppcheck --enable=all --xml --xml-version=2 $WORKSPACE 2> cppcheck-result.xml
-
-    publishers:
-      - archive:
-          artifacts: 'cppcheck-result.xml'
-          allow-empty: false
-      - cppcheck:
-          pattern: 'cppcheck-result.xml'
-      - email-ext: *lttng-tools_publisher_email-ext_defaults
-
 - job-template:
     name: lttng-tools_{version}_scan-build
     defaults: lttng-tools
-    node: 'amd64'
+    node: 'bionic-amd64'
 
     triggers:
       - pollscm:
@@ -753,10 +752,10 @@
     builders:
       - copyartifact:
           <<: *lttng-tools_steps_copyartifact_defaults
-          project: 'liburcu_{urcuversion}_build/arch=amd64,conf=std,build=std'
+          project: 'liburcu_{urcuversion}_build/platform=bionic-amd64,conf=std,build=std'
       - copyartifact:
           <<: *lttng-tools_steps_copyartifact_defaults
-          project: 'lttng-ust_{ustversion}_build/liburcu_version={urcuversion},arch=amd64,conf=std,build=std'
+          project: 'lttng-ust_{ustversion}_build/liburcu_version={urcuversion},platform=bionic-amd64,conf=std,build=std'
       - shell:
           !include-raw-escape: scripts/common/scan-build.sh
 
@@ -769,7 +768,7 @@
 - job-template:
     name: lttng-tools_{version}_coverity
     defaults: lttng-tools
-    node: 'amd64'
+    node: 'bionic-amd64'
 
     triggers:
       - pollscm:
@@ -789,10 +788,10 @@
     builders:
       - copyartifact:
           <<: *lttng-tools_steps_copyartifact_defaults
-          project: 'liburcu_{urcuversion}_build/arch=amd64,conf=std,build=std'
+          project: 'liburcu_{urcuversion}_build/platform=bionic-amd64,conf=std,build=std'
       - copyartifact:
           <<: *lttng-tools_steps_copyartifact_defaults
-          project: 'lttng-ust_{ustversion}_build/liburcu_version={urcuversion},arch=amd64,conf=std,build=std'
+          project: 'lttng-ust_{ustversion}_build/liburcu_version={urcuversion},platform=bionic-amd64,conf=std,build=std'
       - shell:
           !include-raw-escape: scripts/common/coverity.sh
 
@@ -825,11 +824,23 @@
       - master
     jobs:
       # Master #
+      - '{job_prefix}lttng-tools_{version}_{buildtype}':
+          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]
+          testtypes: !!python/tuple [base]
+          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
-          archs: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           builds: !!python/tuple [std, oot, dist]
           confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback]
           urcuversions: !!python/tuple [master]
@@ -841,7 +852,7 @@
           buildtype: portbuild
           version: master
           ustversion: master
-          archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
+          platforms: !!python/tuple [deb11-armhf, deb11-arm64, sid-powerpc, deb11-ppc64el, deb11-i386]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std, no-ust, agents]
           urcuversions: !!python/tuple [master]
@@ -853,7 +864,7 @@
           buildtype: slesbuild
           version: master
           ustversion: master
-          archs: !!python/tuple [sles12sp5]
+          platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           urcuversions: !!python/tuple [master]
@@ -865,7 +876,19 @@
           buildtype: elbuild
           version: master
           ustversion: master
-          archs: !!python/tuple [el8]
+          platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64]
+          builds: !!python/tuple [std]
+          confs: !!python/tuple [std]
+          urcuversions: !!python/tuple [master]
+          babelversions: !!python/tuple [stable-2.0]
+          testtypes: !!python/tuple [base]
+          filter: ''
+          touchstone: ''
+      - '{job_prefix}lttng-tools_{version}_{buildtype}':
+          buildtype: yoctobuild
+          version: master
+          ustversion: master
+          platforms: !!python/tuple [yocto23-powerpcspe, yocto23-powerpc, yocto31-ppc64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           urcuversions: !!python/tuple [master]
@@ -877,7 +900,7 @@
           buildtype: macosbuild
           version: master
           ustversion: master
-          archs: !!python/tuple [macos-amd64, macos-arm64]
+          platforms: !!python/tuple [macos-amd64, macos-arm64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [relayd-only]
           urcuversions: !!python/tuple [master]
@@ -888,7 +911,7 @@
       - 'lttng-tools_{version}_winbuild':
           version: master
           ustversion: master
-          archs: !!python/tuple [cygwin64]
+          platforms: !!python/tuple [cygwin64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [relayd-only]
           urcuversions: !!python/tuple [master]
@@ -900,7 +923,7 @@
           buildtype: build
           version: master
           ustversion: master
-          archs: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           urcuversions: !!python/tuple [master]
@@ -912,13 +935,25 @@
           buildtype: build
           version: master
           ustversion: master
-          archs: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           urcuversions: !!python/tuple [master]
           babelversions: !!python/tuple [stable-2.0]
           testtypes: !!python/tuple [base]
-          filter: ''
+          filter: '(node=="amd64-rootnode" && platform=="bionic-amd64")'
+          touchstone: ''
+      - '{job_prefix}lttng-tools_{version}_rootbuild_i386':
+          buildtype: portbuild
+          version: master
+          ustversion: master
+          platforms: !!python/tuple [deb11-i386]
+          builds: !!python/tuple [std]
+          confs: !!python/tuple [agents]
+          urcuversions: !!python/tuple [master]
+          babelversions: !!python/tuple [stable-2.0]
+          testtypes: !!python/tuple [base]
+          filter: '(node=="i386-rootnode" && platform=="deb11-i386")'
           touchstone: ''
       - 'lttng-tools_{version}_scan-build':
           version: master
@@ -930,11 +965,23 @@
           ustversion: master
 
       # stable-2.13
+      - '{job_prefix}lttng-tools_{version}_{buildtype}':
+          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]
+          testtypes: !!python/tuple [base]
+          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
-          archs: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           builds: !!python/tuple [std, oot, dist]
           confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback]
           urcuversions: !!python/tuple [stable-0.13]
@@ -946,7 +993,7 @@
           buildtype: portbuild
           version: stable-2.13
           ustversion: stable-2.13
-          archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
+          platforms: !!python/tuple [deb11-armhf, deb11-arm64, sid-powerpc, deb11-ppc64el, deb11-i386]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std, no-ust, agents]
           urcuversions: !!python/tuple [stable-0.13]
@@ -958,7 +1005,7 @@
           buildtype: slesbuild
           version: stable-2.13
           ustversion: stable-2.13
-          archs: !!python/tuple [sles12sp5]
+          platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           urcuversions: !!python/tuple [stable-0.13]
@@ -970,7 +1017,7 @@
           buildtype: elbuild
           version: stable-2.13
           ustversion: stable-2.13
-          archs: !!python/tuple [el8]
+          platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           urcuversions: !!python/tuple [stable-0.13]
@@ -982,7 +1029,7 @@
           buildtype: macosbuild
           version: stable-2.13
           ustversion: stable-2.13
-          archs: !!python/tuple [macos-amd64, macos-arm64]
+          platforms: !!python/tuple [macos-amd64, macos-arm64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [relayd-only]
           urcuversions: !!python/tuple [stable-0.13]
@@ -993,7 +1040,7 @@
       - 'lttng-tools_{version}_winbuild':
           version: stable-2.13
           ustversion: stable-2.13
-          archs: !!python/tuple [cygwin64]
+          platforms: !!python/tuple [cygwin64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [relayd-only]
           urcuversions: !!python/tuple [stable-0.13]
@@ -1005,7 +1052,7 @@
           buildtype: build
           version: stable-2.13
           ustversion: stable-2.13
-          archs: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           urcuversions: !!python/tuple [stable-0.13]
@@ -1017,13 +1064,13 @@
           buildtype: build
           version: stable-2.13
           ustversion: stable-2.13
-          archs: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           urcuversions: !!python/tuple [stable-0.13]
           babelversions: !!python/tuple [stable-2.0]
           testtypes: !!python/tuple [base]
-          filter: ''
+          filter: '(node=="amd64-rootnode" && platform=="bionic-amd64")'
           touchstone: ''
       - 'lttng-tools_{version}_release':
           version: v2.13
@@ -1036,14 +1083,26 @@
           ustversion: stable-2.13
 
       # stable-2.12
+      - '{job_prefix}lttng-tools_{version}_{buildtype}':
+          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]
+          testtypes: !!python/tuple [base]
+          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
-          archs: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           builds: !!python/tuple [std, oot, dist]
           confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback]
-          urcuversions: !!python/tuple [stable-0.12]
+          urcuversions: !!python/tuple [stable-0.13]
           babelversions: !!python/tuple [stable-2.0]
           testtypes: !!python/tuple [base]
           filter: '(build=="std") || ((babeltrace_version=="stable-2.0" && (conf=="std" || conf=="agents" || conf=="no-ust")))'
@@ -1052,10 +1111,10 @@
           buildtype: portbuild
           version: stable-2.12
           ustversion: stable-2.12
-          archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
+          platforms: !!python/tuple [deb11-armhf, deb11-arm64, sid-powerpc, deb11-ppc64el, deb11-i386]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std, no-ust, agents]
-          urcuversions: !!python/tuple [stable-0.12]
+          urcuversions: !!python/tuple [stable-0.13]
           babelversions: !!python/tuple [stable-2.0]
           testtypes: !!python/tuple [base]
           filter: ''
@@ -1064,10 +1123,10 @@
           buildtype: slesbuild
           version: stable-2.12
           ustversion: stable-2.12
-          archs: !!python/tuple [sles12sp5]
+          platforms: !!python/tuple [sles12sp5-amd64, sles15sp4-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
-          urcuversions: !!python/tuple [stable-0.12]
+          urcuversions: !!python/tuple [stable-0.13]
           babelversions: !!python/tuple [stable-2.0]
           testtypes: !!python/tuple [base]
           filter: ''
@@ -1076,10 +1135,10 @@
           buildtype: elbuild
           version: stable-2.12
           ustversion: stable-2.12
-          archs: !!python/tuple [el8]
+          platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
-          urcuversions: !!python/tuple [stable-0.12]
+          urcuversions: !!python/tuple [stable-0.13]
           babelversions: !!python/tuple [stable-2.0]
           testtypes: !!python/tuple [base]
           filter: ''
@@ -1088,10 +1147,10 @@
           buildtype: macosbuild
           version: stable-2.12
           ustversion: stable-2.12
-          archs: !!python/tuple [macos-amd64, macos-arm64]
+          platforms: !!python/tuple [macos-amd64, macos-arm64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [relayd-only]
-          urcuversions: !!python/tuple [stable-0.12]
+          urcuversions: !!python/tuple [stable-0.13]
           babelversions: !!python/tuple [stable-2.0]
           testtypes: !!python/tuple [base]
           filter: ''
@@ -1099,10 +1158,10 @@
       - 'lttng-tools_{version}_winbuild':
           version: stable-2.12
           ustversion: stable-2.12
-          archs: !!python/tuple [cygwin64]
+          platforms: !!python/tuple [cygwin64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [relayd-only]
-          urcuversions: !!python/tuple [stable-0.12]
+          urcuversions: !!python/tuple [stable-0.13]
           babelversions: !!python/tuple [stable-2.0]
           testtypes: !!python/tuple [base]
           filter: ''
@@ -1111,10 +1170,10 @@
           buildtype: build
           version: stable-2.12
           ustversion: stable-2.12
-          archs: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
-          urcuversions: !!python/tuple [stable-0.12]
+          urcuversions: !!python/tuple [stable-0.13]
           babelversions: !!python/tuple [stable-2.0]
           testtypes: !!python/tuple [full]
           filter: ''
@@ -1123,27 +1182,24 @@
           buildtype: build
           version: stable-2.12
           ustversion: stable-2.12
-          archs: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
-          urcuversions: !!python/tuple [stable-0.12]
+          urcuversions: !!python/tuple [stable-0.13]
           babelversions: !!python/tuple [stable-2.0]
           testtypes: !!python/tuple [base]
-          filter: ''
+          filter: '(node=="amd64-rootnode" && platform=="bionic-amd64")'
           touchstone: ''
       - 'lttng-tools_{version}_release':
           version: v2.12
           ustversion: stable-2.12
-          urcuversion: stable-0.12
+          urcuversion: stable-0.13
           babelversion: stable-2.0
       - 'lttng-tools_{version}_scan-build':
           version: stable-2.12
-          urcuversion: stable-0.12
+          urcuversion: stable-0.13
           ustversion: stable-2.12
 
-      # Other jobs
-      - 'lttng-tools_{version}_cppcheck'
-
 - project:
     name: dev_upstream_lttng-tools
     job_prefix: 'dev_upstream_'
@@ -1158,7 +1214,7 @@
           buildtype: build
           version: stable-2.11
           ustversion: stable-2.11
-          archs: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           builds: !!python/tuple [std, oot, dist]
           confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback]
           urcuversions: !!python/tuple [stable-0.11]
@@ -1170,7 +1226,7 @@
           buildtype: portbuild
           version: stable-2.11
           ustversion: stable-2.11
-          archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
+          platforms: !!python/tuple [deb11-armhf, deb11-arm64, sid-powerpc, deb11-ppc64el, deb11-i386]
           builds: !!python/tuple [std]
           confs: !!python/tuple [no-ust, agents]
           urcuversions: !!python/tuple [stable-0.11]
@@ -1182,7 +1238,7 @@
           buildtype: slesbuild
           version: stable-2.11
           ustversion: stable-2.11
-          archs: !!python/tuple [sles12sp5]
+          platforms: !!python/tuple [sles12sp5-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           urcuversions: !!python/tuple [stable-0.11]
@@ -1194,7 +1250,7 @@
           buildtype: elbuild
           version: stable-2.11
           ustversion: stable-2.11
-          archs: !!python/tuple [el8]
+          platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           urcuversions: !!python/tuple [stable-0.11]
@@ -1206,7 +1262,7 @@
           buildtype: build
           version: stable-2.11
           ustversion: stable-2.11
-          archs: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           urcuversions: !!python/tuple [stable-0.11]
@@ -1218,7 +1274,7 @@
           buildtype: build
           version: stable-2.11
           ustversion: stable-2.11
-          archs: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           urcuversions: !!python/tuple [stable-0.11]
@@ -1232,7 +1288,7 @@
           buildtype: build
           version: stable-2.10
           ustversion: stable-2.10
-          archs: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           builds: !!python/tuple [std, oot, dist]
           confs: !!python/tuple [std, no-ust, agents, debug-rcu, tls_fallback]
           urcuversions: !!python/tuple [stable-0.9]
@@ -1244,7 +1300,7 @@
           buildtype: portbuild
           version: stable-2.10
           ustversion: stable-2.10
-          archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
+          platforms: !!python/tuple [deb11-armhf, deb11-arm64, sid-powerpc, deb11-ppc64el, deb11-i386]
           builds: !!python/tuple [std]
           confs: !!python/tuple [no-ust, agents]
           urcuversions: !!python/tuple [stable-0.9]
@@ -1256,7 +1312,7 @@
           buildtype: slesbuild
           version: stable-2.10
           ustversion: stable-2.10
-          archs: !!python/tuple [sles12sp5]
+          platforms: !!python/tuple [sles12sp5-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           urcuversions: !!python/tuple [stable-0.9]
@@ -1268,7 +1324,7 @@
           buildtype: elbuild
           version: stable-2.10
           ustversion: stable-2.10
-          archs: !!python/tuple [el8]
+          platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           urcuversions: !!python/tuple [stable-0.9]
@@ -1280,7 +1336,7 @@
           buildtype: build
           version: stable-2.10
           ustversion: stable-2.10
-          archs: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           urcuversions: !!python/tuple [stable-0.9]
@@ -1304,7 +1360,7 @@
           buildtype: build
           version: master-staging
           ustversion: master
-          archs: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           builds: !!python/tuple [std, oot, dist]
           confs: !!python/tuple [std, no-ust, agents]
           urcuversions: !!python/tuple [master]
@@ -1316,7 +1372,7 @@
           buildtype: portbuild
           version: master-staging
           ustversion: master
-          archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
+          platforms: !!python/tuple [deb11-armhf, deb11-arm64, sid-powerpc, deb11-ppc64el, deb11-i386]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std, no-ust, agents]
           urcuversions: !!python/tuple [master]
@@ -1328,7 +1384,7 @@
           buildtype: macosbuild
           version: master-staging
           ustversion: master
-          archs: !!python/tuple [macos-amd64, macos-arm64]
+          platforms: !!python/tuple [macos-amd64, macos-arm64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [relayd-only]
           urcuversions: !!python/tuple [master]
@@ -1342,10 +1398,10 @@
           buildtype: build
           version: stable-2.13-staging
           ustversion: stable-2.13
-          archs: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           builds: !!python/tuple [std, oot, dist]
           confs: !!python/tuple [std, no-ust, agents]
-          urcuversions: !!python/tuple [stable-0.12]
+          urcuversions: !!python/tuple [stable-0.13]
           babelversions: !!python/tuple [stable-2.0, master]
           testtypes: !!python/tuple [base]
           filter: ''
@@ -1354,10 +1410,10 @@
           buildtype: portbuild
           version: stable-2.13-staging
           ustversion: stable-2.13
-          archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
+          platforms: !!python/tuple [deb11-armhf, deb11-arm64, sid-powerpc, deb11-ppc64el, deb11-i386]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std, no-ust, agents]
-          urcuversions: !!python/tuple [stable-0.12]
+          urcuversions: !!python/tuple [stable-0.13]
           babelversions: !!python/tuple [stable-2.0]
           testtypes: !!python/tuple [base]
           filter: ''
@@ -1368,10 +1424,10 @@
           buildtype: build
           version: stable-2.12-staging
           ustversion: stable-2.12
-          archs: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           builds: !!python/tuple [std, oot, dist]
           confs: !!python/tuple [std, no-ust, agents]
-          urcuversions: !!python/tuple [stable-0.12]
+          urcuversions: !!python/tuple [stable-0.13]
           babelversions: !!python/tuple [stable-2.0, master]
           testtypes: !!python/tuple [base]
           filter: ''
@@ -1380,10 +1436,10 @@
           buildtype: portbuild
           version: stable-2.12-staging
           ustversion: stable-2.12
-          archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
+          platforms: !!python/tuple [deb11-armhf, deb11-arm64, sid-powerpc, deb11-ppc64el, deb11-i386]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std, no-ust, agents]
-          urcuversions: !!python/tuple [stable-0.12]
+          urcuversions: !!python/tuple [stable-0.13]
           babelversions: !!python/tuple [stable-2.0]
           testtypes: !!python/tuple [base]
           filter: ''
@@ -1404,7 +1460,7 @@
           buildtype: build
           version: stable-2.11-staging
           ustversion: stable-2.11
-          archs: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           builds: !!python/tuple [std, oot, dist]
           confs: !!python/tuple [std, no-ust, agents]
           urcuversions: !!python/tuple [stable-0.11]
@@ -1416,7 +1472,7 @@
           buildtype: portbuild
           version: stable-2.11-staging
           ustversion: stable-2.11
-          archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
+          platforms: !!python/tuple [deb11-armhf, deb11-arm64, sid-powerpc, deb11-ppc64el, deb11-i386]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std, no-ust, agents]
           urcuversions: !!python/tuple [stable-0.11]
@@ -1430,7 +1486,7 @@
           buildtype: build
           version: stable-2.10-staging
           ustversion: stable-2.10
-          archs: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           builds: !!python/tuple [std, oot, dist]
           confs: !!python/tuple [std, no-ust, agents]
           urcuversions: !!python/tuple [stable-0.9]
@@ -1442,7 +1498,7 @@
           buildtype: portbuild
           version: stable-2.10-staging
           ustversion: stable-2.10
-          archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
+          platforms: !!python/tuple [deb11-armhf, deb11-arm64, sid-powerpc, deb11-ppc64el, deb11-i386]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std, no-ust, agents]
           urcuversions: !!python/tuple [stable-0.9]
@@ -1461,23 +1517,23 @@
     jobs:
       - 'dev_gerrit_lttng-tools_{buildtype}':
           buildtype: build
-          archs: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           builds: !!python/tuple [std, oot, dist, oot-dist]
           confs: !!python/tuple [std, no-ust, agents]
-          urcuversions: !!python/tuple [master] # Switch to stable-0.14 when released (for C++ support)
+          urcuversions: !!python/tuple [stable-0.14] # Baseline is stable-0.14 for C++ support
           babelversions: !!python/tuple [stable-2.0]
           testtypes: !!python/tuple [base]
           filter: ''
           touchstone: ''
       - 'dev_gerrit_lttng-tools_rootbuild':
           buildtype: build
-          archs: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
-          urcuversions: !!python/tuple [master] # Switch to stable-0.14 when released (for C++ support)
+          urcuversions: !!python/tuple [stable-0.14] # Baseline is stable-0.14 for C++ support
           babelversions: !!python/tuple [stable-2.0]
           testtypes: !!python/tuple [base]
-          filter: ''
+          filter: '(node=="amd64-rootnode" && platform=="bionic-amd64")'
           touchstone: ''
 
 - project: