X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-ust.yaml;h=03cb8a342591c23dcf1933daf0cca33a1c3fc75d;hb=4174b905424b75e342b3bd0c68789ef021b61778;hp=9709a4ce631fb16aa39bffa27c69562eab67dba4;hpb=1722d4cb5294835c862fc49261d3730830d71e49;p=lttng-ci.git

diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index 9709a4c..03cb8a3 100644
--- a/jobs/lttng-ust.yaml
+++ b/jobs/lttng-ust.yaml
@@ -40,7 +40,8 @@
           properties-content: |
             PROJECT_NAME=lttng-ust
       - build-discarder:
-          num-to-keep: 2
+          num-to-keep: 10
+          artifact-num-to-keep: 2
       - github:
           url: https://github.com/{github_user}/{github_name}
 
@@ -56,10 +57,10 @@
         expr: '{touchstone}'
         result: unstable
     axes:
-      - axis: &lttng-ust_matrix_axis_arch
+      - axis: &lttng-ust_matrix_axis_platform
          type: slave
-         name: arch
-         values: '{obj:archs}'
+         name: platform
+         values: '{obj:platforms}'
       - axis: &lttng-ust_matrix_axis_conf
          type: user-defined
          name: conf
@@ -79,7 +80,7 @@
     node: 'master' # Applies only to matrix flyweight task
     execution-strategy: *lttng-ust_matrix_execution-strategy_defaults
     axes:
-      - axis: *lttng-ust_matrix_axis_arch
+      - axis: *lttng-ust_matrix_axis_platform
       - axis: *lttng-ust_matrix_axis_conf
       - axis: *lttng-ust_matrix_axis_build
 
@@ -118,7 +119,7 @@
 
       - copyartifact:
           <<: *lttng-ust_steps_copyartifact_defaults
-          project: '{job_prefix}liburcu_${{liburcu_version}}_{buildtype}/arch=${{arch}},conf=${{liburcu_conf}},build=std'
+          project: '{job_prefix}liburcu_${{liburcu_version}}_{buildtype}/platform=${{platform}},conf=${{liburcu_conf}},build=std'
 
       # Run the build
       - shell:
@@ -161,11 +162,11 @@
 
       - copyartifact:
           <<: *lttng-ust_steps_copyartifact_defaults
-          project: 'liburcu_${{liburcu_version}}_{buildtype}/arch=${{arch}},conf=${{liburcu_conf}},build=std'
+          project: 'liburcu_${{liburcu_version}}_{buildtype}/platform=${{platform}},conf=${{liburcu_conf}},build=std'
 
       - copyartifact:
           <<: *lttng-ust_steps_copyartifact_defaults
-          project: 'babeltrace_{babeltrace_version}_{buildtype}/arch=${{arch}},conf=std,build=std'
+          project: 'babeltrace_{babeltrace_version}_{buildtype}/platform=${{platform}},conf=std,build=std'
 
       - shell: |
            #!/bin/bash
@@ -193,6 +194,8 @@
           results: 'tap/**/*.log'
           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-ust_publisher_warnings-ng_defaults
           xml: |
@@ -206,14 +209,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/>
@@ -243,7 +238,7 @@
               <scm/>
             </io.jenkins.plugins.analysis.core.steps.IssuesRecorder>
       - archive: &lttng-ust_publisher_archive_defaults
-          artifacts: 'build/**,tap/**'
+          artifacts: 'build/**,tap/**,log/**'
           allow-empty: false
       - workspace-cleanup: &lttng-ust_publisher_workspace-cleanup_defaults
           clean-if:
@@ -288,14 +283,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/>
@@ -424,36 +411,10 @@
             - 'gerrit-{buildtype}'
 
 
-- job-template:
-    name: lttng-ust_{version}_cppcheck
-    defaults: lttng-ust
-
-    triggers:
-      - pollscm:
-          cron: "@daily"
-
-    builders:
-      - shell: |
-          rm -f cppcheck-result.xml
-          cppcheck --enable=all --xml --xml-version=2 $WORKSPACE/src/lttng-ust 2> cppcheck-result.xml
-
-    publishers:
-      - archive:
-          artifacts: 'cppcheck-result.xml'
-          allow-empty: false
-      - cppcheck:
-          pattern: 'cppcheck-result.xml'
-      - email:
-          recipients: 'ci-notification@lists.lttng.org'
-          notify-every-unstable-build: true
-          send-to-individuals: false
-      - workspace-cleanup: *lttng-ust_publisher_workspace-cleanup_defaults
-
-
 - job-template:
     name: lttng-ust_{version}_scan-build
     defaults: lttng-ust
-    node: 'amd64'
+    node: 'bionic-amd64'
 
     triggers:
       - pollscm:
@@ -462,7 +423,7 @@
     builders:
       - copyartifact:
           <<: *lttng-ust_steps_copyartifact_defaults
-          project: liburcu_master_build/arch=amd64,conf=std,build=std
+          project: liburcu_master_build/platform=bionic-amd64,conf=std,build=std
       - shell:
           !include-raw-escape: scripts/common/scan-build.sh
 
@@ -477,7 +438,7 @@
 - job-template:
     name: lttng-ust_{version}_coverity
     defaults: lttng-ust
-    node: 'amd64'
+    node: 'bionic-amd64'
 
     triggers:
       - pollscm:
@@ -497,7 +458,7 @@
     builders:
       - copyartifact:
           <<: *lttng-ust_steps_copyartifact_defaults
-          project: liburcu_master_build/arch=amd64,conf=std,build=std
+          project: liburcu_master_build/platform=bionic-amd64,conf=std,build=std
       - shell:
           !include-raw-escape: scripts/common/coverity.sh
 
@@ -524,19 +485,28 @@
     email_to: 'ci-notification@lists.lttng.org, cc:mathieu.desnoyers@efficios.com'
     jobs:
       ## Master ##
+      - '{job_prefix}lttng-ust_{version}_{buildtype}':
+          buildtype: linuxbuild
+          version: master
+          platforms: !!python/tuple [jammy-amd64]
+          builds: !!python/tuple [std, dist, oot, oot-dist]
+          confs: !!python/tuple [std, agents, debug-rcu, tls_fallback]
+          liburcu_versions: !!python/tuple [stable-0.13, stable-0.14, master]
+          filter: '(build=="std") || ((liburcu_version=="master" && (conf=="std" || conf=="agents")))'
+          touchstone: ''
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: build
           version: master
-          archs: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           builds: !!python/tuple [std, dist, oot, oot-dist]
           confs: !!python/tuple [std, agents, debug-rcu, tls_fallback]
-          liburcu_versions: !!python/tuple [stable-0.13, master]
+          liburcu_versions: !!python/tuple [stable-0.13, stable-0.14, master]
           filter: '(build=="std") || ((liburcu_version=="master" && (conf=="std" || conf=="agents")))'
           touchstone: ''
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: portbuild
           version: 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, agents]
           liburcu_versions: !!python/tuple [stable-0.13, master]
@@ -545,7 +515,7 @@
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
           version: master
-          archs: !!python/tuple [sles12sp5]
+          platforms: !!python/tuple [sles12sp5-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           liburcu_versions: !!python/tuple [stable-0.13, master]
@@ -554,7 +524,16 @@
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: elbuild
           version: master
-          archs: !!python/tuple [el8, el9]
+          platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64]
+          builds: !!python/tuple [std]
+          confs: !!python/tuple [std]
+          liburcu_versions: !!python/tuple [stable-0.13, master]
+          filter: ''
+          touchstone: ''
+      - '{job_prefix}lttng-ust_{version}_{buildtype}':
+          buildtype: yoctobuild
+          version: master
+          platforms: !!python/tuple [yocto23-powerpcspe, yocto23-powerpc, yocto31-ppc64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           liburcu_versions: !!python/tuple [stable-0.13, master]
@@ -563,33 +542,40 @@
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: freebsdbuild
           version: master
-          archs: !!python/tuple [freebsd]
+          platforms: !!python/tuple [freebsd-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           liburcu_versions: !!python/tuple [stable-0.13, master]
           filter: ''
           touchstone: ''
-      - 'lttng-ust_{version}_cppcheck':
-          version: master
       - 'lttng-ust_{version}_scan-build':
           version: master
       - 'lttng-ust_{version}_coverity':
           version: master
 
       ## Stable 2.13 ##
+      - '{job_prefix}lttng-ust_{version}_{buildtype}':
+          buildtype: linuxbuild
+          version: stable-2.13
+          platforms: !!python/tuple [jammy-amd64]
+          builds: !!python/tuple [std, dist, oot, oot-dist]
+          confs: !!python/tuple [std, agents, debug-rcu, tls_fallback]
+          liburcu_versions: !!python/tuple [stable-0.13, stable-0.14, master]
+          filter: '(build=="std") || ((liburcu_version=="stable-0.13" && (conf=="std" || conf=="agents")))'
+          touchstone: ''
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: build
           version: stable-2.13
-          archs: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           builds: !!python/tuple [std, dist, oot, oot-dist]
           confs: !!python/tuple [std, agents, debug-rcu, tls_fallback]
-          liburcu_versions: !!python/tuple [stable-0.13, master]
+          liburcu_versions: !!python/tuple [stable-0.13, stable-0.14, master]
           filter: '(build=="std") || ((liburcu_version=="stable-0.13" && (conf=="std" || conf=="agents")))'
           touchstone: ''
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: portbuild
           version: 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, agents]
           liburcu_versions: !!python/tuple [stable-0.13, master]
@@ -598,7 +584,7 @@
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
           version: stable-2.13
-          archs: !!python/tuple [sles12sp5]
+          platforms: !!python/tuple [sles12sp5-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           liburcu_versions: !!python/tuple [stable-0.13, master]
@@ -607,57 +593,61 @@
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: elbuild
           version: stable-2.13
-          archs: !!python/tuple [el8, el9]
+          platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           liburcu_versions: !!python/tuple [stable-0.13, master]
           filter: ''
           touchstone: ''
-      - 'lttng-ust_{version}_cppcheck':
-          version: stable-2.13
       - 'lttng-ust_{version}_scan-build':
           version: stable-2.13
 
       ## Stable 2.12 ##
+      - '{job_prefix}lttng-ust_{version}_{buildtype}':
+          buildtype: linuxbuild
+          version: stable-2.12
+          platforms: !!python/tuple [jammy-amd64]
+          builds: !!python/tuple [std, dist, oot, oot-dist]
+          confs: !!python/tuple [std, agents, debug-rcu, tls_fallback]
+          liburcu_versions: !!python/tuple [stable-0.13, stable-0.14, master]
+          filter: '(build=="std") || ((liburcu_version=="stable-0.13" && (conf=="std" || conf=="agents")))'
+          touchstone: ''
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: build
           version: stable-2.12
-          archs: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           builds: !!python/tuple [std, dist, oot, oot-dist]
           confs: !!python/tuple [std, agents, debug-rcu, tls_fallback]
-          liburcu_versions: !!python/tuple [stable-0.12, stable-0.13, master]
-          filter: '(build=="std") || ((liburcu_version=="stable-0.12" && (conf=="std" || conf=="agents")))'
+          liburcu_versions: !!python/tuple [stable-0.13, stable-0.14, master]
+          filter: '(build=="std") || ((liburcu_version=="stable-0.13" && (conf=="std" || conf=="agents")))'
           touchstone: ''
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: portbuild
           version: stable-2.12
-          archs: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
-          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, agents]
-          liburcu_versions: !!python/tuple [stable-0.12, stable-0.13, master]
+          liburcu_versions: !!python/tuple [stable-0.13, master]
           filter: ''
           touchstone: ''
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
           version: stable-2.12
-          archs: !!python/tuple [sles12sp5]
+          platforms: !!python/tuple [sles12sp5-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
-          liburcu_versions: !!python/tuple [stable-0.12, stable-0.13, master]
+          liburcu_versions: !!python/tuple [stable-0.13]
           filter: ''
           touchstone: ''
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: elbuild
           version: stable-2.12
-          archs: !!python/tuple [el8, el9]
+          platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
-          liburcu_versions: !!python/tuple [stable-0.12, stable-0.13, master]
+          liburcu_versions: !!python/tuple [stable-0.13]
           filter: ''
           touchstone: ''
-      - 'lttng-ust_{version}_cppcheck':
-          version: stable-2.12
       - 'lttng-ust_{version}_scan-build':
           version: stable-2.12
 
@@ -673,7 +663,7 @@
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: build
           version: stable-2.11
-          archs: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           builds: !!python/tuple [std, dist, oot, oot-dist]
           confs: !!python/tuple [std, agents, debug-rcu, tls_fallback]
           liburcu_versions: !!python/tuple [stable-0.11]
@@ -682,7 +672,7 @@
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: portbuild
           version: 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 [agents]
           liburcu_versions: !!python/tuple [stable-0.11]
@@ -691,7 +681,7 @@
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
           version: stable-2.11
-          archs: !!python/tuple [sles12sp5]
+          platforms: !!python/tuple [sles12sp5-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           liburcu_versions: !!python/tuple [stable-0.11]
@@ -700,7 +690,7 @@
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: elbuild
           version: stable-2.11
-          archs: !!python/tuple [el8, el9]
+          platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           liburcu_versions: !!python/tuple [stable-0.11]
@@ -711,7 +701,7 @@
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: build
           version: stable-2.10
-          archs: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           builds: !!python/tuple [std, dist, oot, oot-dist]
           confs: !!python/tuple [std, agents, debug-rcu, tls_fallback]
           liburcu_versions: !!python/tuple [stable-0.9]
@@ -720,7 +710,7 @@
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: portbuild
           version: 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 [agents]
           liburcu_versions: !!python/tuple [stable-0.9]
@@ -729,7 +719,7 @@
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
           version: stable-2.10
-          archs: !!python/tuple [sles12sp5]
+          platforms: !!python/tuple [sles12sp5-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
           liburcu_versions: !!python/tuple [stable-0.9]
@@ -738,7 +728,7 @@
       - '{job_prefix}lttng-ust_{version}_{buildtype}':
           buildtype: elbuild
           version: stable-2.10
-          archs: !!python/tuple [el8, el9]
+          platforms: !!python/tuple [el7-amd64, el8-amd64, el9-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [std]
           liburcu_versions: !!python/tuple [stable-0.9]
@@ -754,35 +744,35 @@
     jobs:
       - 'dev_gerrit_lttng-ust_{buildtype}':
           buildtype: build
-          archs: !!python/tuple [amd64]
+          platforms: !!python/tuple [bionic-amd64]
           builds: !!python/tuple [std, oot, dist, oot-dist]
           confs: !!python/tuple [std, agents]
-          liburcu_versions: !!python/tuple [stable-0.13]
+          liburcu_versions: !!python/tuple [stable-0.14]
           filter: ''
           touchstone: ''
       - 'dev_gerrit_lttng-ust_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, agents]
           filter: ''
           touchstone: ''
-          liburcu_version: stable-0.13
+          liburcu_version: stable-0.14
           babeltrace_version: stable-2.0
       - 'dev_gerrit_lttng-ust_{buildtype}':
           buildtype: portbuild
-          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 [agents]
-          liburcu_versions: !!python/tuple [stable-0.13]
+          liburcu_versions: !!python/tuple [stable-0.14]
           filter: ''
           touchstone: ''
       - 'dev_gerrit_lttng-ust_{buildtype}':
           buildtype: freebsdbuild
-          archs: !!python/tuple [freebsd]
+          platforms: !!python/tuple [freebsd-amd64]
           builds: !!python/tuple [std]
           confs: !!python/tuple [agents]
-          liburcu_versions: !!python/tuple [stable-0.13]
+          liburcu_versions: !!python/tuple [stable-0.14]
           filter: ''
           touchstone: ''