X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-ust.yaml;h=0652f59c0518d8e6b851c60a49eb308f01d09286;hb=a46ed0a6eb1d2104563f0978398791519e90d82d;hp=c2208bc2993afdfc68f91976cc491caef5ce57e6;hpb=3522265a374898913049aac554aa41711e511bd6;p=lttng-ci.git

diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index c2208bc..0652f59 100644
--- a/jobs/lttng-ust.yaml
+++ b/jobs/lttng-ust.yaml
@@ -61,21 +61,40 @@
       - axis:
          type: user-defined
          name: liburcu_version
-         values:
-           !include: jobs/inc/liburcu-versions.yaml.inc
+         values: '{obj:liburcu_version}'
       - axis:
          type: user-defined
          name: build
          values: '{obj:build}'
 
     builders:
-      - copyartifact:
-          project: liburcu_${{liburcu_version}}_{buildtype}/arch=$arch,conf=std,build=std
-          which-build: last-successful
-          stable: false
-          filter: 'build/**'
-          target: 'deps/liburcu'
-          do-not-fingerprint: true
+      - conditional-step:
+          condition-kind: regex-match
+          label: '$conf'
+          regex: (std|agents)
+          on-evaluation-failure: run
+          steps:
+            - copyartifact:
+                project: liburcu_${{liburcu_version}}_{buildtype}/arch=$arch,conf=std,build=std
+                which-build: last-successful
+                stable: false
+                filter: 'build/**'
+                target: 'deps/liburcu'
+                do-not-fingerprint: true
+
+      - conditional-step:
+          condition-kind: regex-match
+          label: '$conf'
+          regex: (debug-rcu)
+          on-evaluation-failure: run
+          steps:
+            - copyartifact:
+                project: liburcu_${{liburcu_version}}_{buildtype}/arch=$arch,conf=debug-rcu,build=std
+                which-build: last-successful
+                stable: false
+                filter: 'build/**'
+                target: 'deps/liburcu'
+                do-not-fingerprint: true
       - shell:
          !include-raw-escape: scripts/lttng-ust/build.sh
 
@@ -244,20 +263,53 @@
       - stable-2.7
       - stable-2.8
       - stable-2.9
-      - master
+      - stable-2.10
     jobs:
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: build
           arch: !!python/tuple [x86-32, x86-64]
           build: !!python/tuple [std, dist, oot, oot-dist]
-          conf: !!python/tuple [std, agents]
+          conf: !!python/tuple [std, agents, debug-rcu]
+          liburcu_version: !!python/tuple [stable-0.8, stable-0.9, stable-0.10, master]
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: portbuild
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, agents]
+          liburcu_version: !!python/tuple [stable-0.8, stable-0.9, stable-0.10, master]
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: slesbuild
+          arch: !!python/tuple [sles12sp2]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std]
+          liburcu_version: !!python/tuple [stable-0.8, stable-0.9, stable-0.10, master]
       - 'lttng-ust_{version}_cppcheck'
       - 'lttng-ust_{version}_scan-build'
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: build
+          version: master
+          arch: !!python/tuple [x86-32, x86-64]
+          build: !!python/tuple [std, dist, oot, oot-dist]
+          conf: !!python/tuple [std, agents, debug-rcu]
+          liburcu_version: !!python/tuple [master]
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: portbuild
+          version: master
+          arch: !!python/tuple [armhf, arm64, powerpc, ppc64el]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std, agents]
+          liburcu_version: !!python/tuple [master]
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: slesbuild
+          version: master
+          arch: !!python/tuple [sles12sp2]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std]
+          liburcu_version: !!python/tuple [master]
+      - 'lttng-ust_{version}_cppcheck':
+          version: master
+      - 'lttng-ust_{version}_scan-build':
+          version: master
       - 'lttng-ust_{version}_coverity':
           version: master