X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-ust.yaml;h=de4e753492082face50b2ba54c19817180f1c7b9;hb=7a97936af7e4f1915c81af3d175d0bf6cb652a86;hp=966a433312d6e40cf1db30e535f1e8a37a31edb6;hpb=7c50e5dd1ea2cad31660b60972fba2e7d31f1636;p=lttng-ci.git

diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index 966a433..de4e753 100644
--- a/jobs/lttng-ust.yaml
+++ b/jobs/lttng-ust.yaml
@@ -455,88 +455,92 @@
     github_user: lttng
     github_name: lttng-ust
     email_to: 'ci-notification@lists.lttng.org, cc:mathieu.desnoyers@efficios.com'
-    version:
-      - stable-2.10
-      - stable-2.11
     jobs:
+      ## Master ##
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: build
+          version: master
           arch: !!python/tuple [amd64]
           build: !!python/tuple [std, dist, oot, oot-dist]
           conf: !!python/tuple [std, agents, debug-rcu, tls_fallback]
-          liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]
-          filter: '(build=="std") || ((liburcu_version=="stable-0.12" && (conf=="std" || conf=="agents")))'
+          liburcu_version: !!python/tuple [stable-0.13, master]
+          filter: '(build=="std") || ((liburcu_version=="master" && (conf=="std" || conf=="agents")))'
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: portbuild
+          version: master
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, agents]
-          liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]
+          liburcu_version: !!python/tuple [stable-0.13, master]
           filter: ''
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
+          version: master
           arch: !!python/tuple [sles12sp5]
           build: !!python/tuple [std]
           conf: !!python/tuple [agents]
-          liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]
+          liburcu_version: !!python/tuple [stable-0.13, master]
           filter: ''
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: elbuild
+          version: master
           arch: !!python/tuple [el8]
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
-          liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]
+          liburcu_version: !!python/tuple [stable-0.13, master]
           filter: ''
-      - 'lttng-ust_{version}_cppcheck'
-      - 'lttng-ust_{version}_scan-build'
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: freebsdbuild
+          version: master
+          arch: !!python/tuple [freebsd]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [agents]
+          liburcu_version: !!python/tuple [stable-0.13, master]
+          filter: ''
+      - 'lttng-ust_{version}_cppcheck':
+          version: master
+      - 'lttng-ust_{version}_scan-build':
+          version: master
+      - 'lttng-ust_{version}_coverity':
+          version: master
 
-      ## Master ##
+      ## Stable 2.13 ##
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: build
-          version: master
+          version: stable-2.13
           arch: !!python/tuple [amd64]
           build: !!python/tuple [std, dist, oot, oot-dist]
           conf: !!python/tuple [std, agents, debug-rcu, tls_fallback]
-          liburcu_version: !!python/tuple [stable-0.12, master]
-          filter: '(build=="std") || ((liburcu_version=="master" && (conf=="std" || conf=="agents")))'
+          liburcu_version: !!python/tuple [stable-0.13, master]
+          filter: '(build=="std") || ((liburcu_version=="stable-0.13" && (conf=="std" || conf=="agents")))'
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: portbuild
-          version: master
+          version: stable-2.13
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, agents]
-          liburcu_version: !!python/tuple [stable-0.12, master]
+          liburcu_version: !!python/tuple [stable-0.13, master]
           filter: ''
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
-          version: master
+          version: stable-2.13
           arch: !!python/tuple [sles12sp5]
           build: !!python/tuple [std]
           conf: !!python/tuple [agents]
-          liburcu_version: !!python/tuple [stable-0.12, master]
+          liburcu_version: !!python/tuple [stable-0.13, master]
           filter: ''
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: elbuild
-          version: master
+          version: stable-2.13
           arch: !!python/tuple [el8]
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
-          liburcu_version: !!python/tuple [stable-0.12, master]
-          filter: ''
-      - 'lttng-ust_{version}_{buildtype}':
-          buildtype: freebsdbuild
-          version: master
-          arch: !!python/tuple [freebsd]
-          build: !!python/tuple [std]
-          conf: !!python/tuple [agents]
-          liburcu_version: !!python/tuple [stable-0.12, master]
+          liburcu_version: !!python/tuple [stable-0.13, master]
           filter: ''
       - 'lttng-ust_{version}_cppcheck':
-          version: master
+          version: stable-2.13
       - 'lttng-ust_{version}_scan-build':
-          version: master
-      - 'lttng-ust_{version}_coverity':
-          version: master
+          version: stable-2.13
 
       ## Stable 2.12 ##
       - 'lttng-ust_{version}_{buildtype}':
@@ -545,7 +549,7 @@
           arch: !!python/tuple [amd64]
           build: !!python/tuple [std, dist, oot, oot-dist]
           conf: !!python/tuple [std, agents, debug-rcu, tls_fallback]
-          liburcu_version: !!python/tuple [stable-0.12, master]
+          liburcu_version: !!python/tuple [stable-0.12, stable-0.13, master]
           filter: '(build=="std") || ((liburcu_version=="stable-0.12" && (conf=="std" || conf=="agents")))'
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: portbuild
@@ -553,7 +557,7 @@
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, agents]
-          liburcu_version: !!python/tuple [stable-0.12, master]
+          liburcu_version: !!python/tuple [stable-0.12, stable-0.13, master]
           filter: ''
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
@@ -561,7 +565,7 @@
           arch: !!python/tuple [sles12sp5]
           build: !!python/tuple [std]
           conf: !!python/tuple [agents]
-          liburcu_version: !!python/tuple [stable-0.12, master]
+          liburcu_version: !!python/tuple [stable-0.12, stable-0.13, master]
           filter: ''
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: elbuild
@@ -569,31 +573,83 @@
           arch: !!python/tuple [el8]
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
-          liburcu_version: !!python/tuple [stable-0.12, master]
+          liburcu_version: !!python/tuple [stable-0.12, stable-0.13, master]
           filter: ''
       - 'lttng-ust_{version}_cppcheck':
           version: stable-2.12
       - 'lttng-ust_{version}_scan-build':
           version: stable-2.12
 
-      ## Stable 2.9 ##
+      ## Stable 2.11 ##
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: build
+          version: stable-2.11
+          arch: !!python/tuple [amd64]
+          build: !!python/tuple [std, dist, oot, oot-dist]
+          conf: !!python/tuple [std, agents, debug-rcu, tls_fallback]
+          liburcu_version: !!python/tuple [stable-0.9, stable-0.13, master]
+          filter: '(build=="std") || ((liburcu_version=="stable-0.13" && (conf=="std" || conf=="agents")))'
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: portbuild
+          version: stable-2.11
+          arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std, agents]
+          liburcu_version: !!python/tuple [stable-0.9, stable-0.13, master]
+          filter: ''
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
-          version: stable-2.9
+          version: stable-2.11
           arch: !!python/tuple [sles12sp5]
           build: !!python/tuple [std]
           conf: !!python/tuple [agents]
-          liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]
+          liburcu_version: !!python/tuple [stable-0.9, stable-0.13, master]
           filter: ''
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: elbuild
+          version: stable-2.11
+          arch: !!python/tuple [el8]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std]
+          liburcu_version: !!python/tuple [stable-0.9, stable-0.13, master]
+          filter: ''
+      - 'lttng-ust_{version}_cppcheck':
+          version: stable-2.11
+      - 'lttng-ust_{version}_scan-build':
+          version: stable-2.11
 
-      ## Stable 2.8 ##
+      ## Stable 2.10 ##
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: build
+          version: stable-2.10
+          arch: !!python/tuple [amd64]
+          build: !!python/tuple [std, dist, oot, oot-dist]
+          conf: !!python/tuple [std, agents, debug-rcu, tls_fallback]
+          liburcu_version: !!python/tuple [stable-0.9, stable-0.12]
+          filter: '(build=="std") || ((liburcu_version=="stable-0.13" && (conf=="std" || conf=="agents")))'
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: portbuild
+          version: stable-2.10
+          arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std, agents]
+          liburcu_version: !!python/tuple [stable-0.9, stable-0.12]
+          filter: ''
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
-          version: stable-2.8
+          version: stable-2.10
           arch: !!python/tuple [sles12sp5]
           build: !!python/tuple [std]
           conf: !!python/tuple [agents]
-          liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]
+          liburcu_version: !!python/tuple [stable-0.9, stable-0.12]
+          filter: ''
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: elbuild
+          version: stable-2.10
+          arch: !!python/tuple [el8]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std]
+          liburcu_version: !!python/tuple [stable-0.9, stable-0.12]
           filter: ''
 
 
@@ -607,14 +663,14 @@
           arch: !!python/tuple [amd64]
           build: !!python/tuple [std, oot, dist, oot-dist]
           conf: !!python/tuple [std, agents]
-          liburcu_version: !!python/tuple [stable-0.12]
+          liburcu_version: !!python/tuple [stable-0.13]
           filter: ''
       - 'dev_gerrit_lttng-ust_lttng-tools_{buildtype}':
           buildtype: build
           arch: !!python/tuple [amd64]
           build: !!python/tuple [std, oot, dist, oot-dist]
           conf: !!python/tuple [std, agents]
-          liburcu_version: !!python/tuple [stable-0.12]
+          liburcu_version: !!python/tuple [stable-0.13]
           filter: ''
           babeltrace_version: stable-2.0
 
@@ -623,7 +679,7 @@
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
           build: !!python/tuple [std]
           conf: !!python/tuple [agents]
-          liburcu_version: !!python/tuple [stable-0.12]
+          liburcu_version: !!python/tuple [stable-0.13]
           filter: ''
 
 - project: