jjb: Drop stable-2.9 except for sles

[lttng-ci.git] / jobs / lttng-ust.yaml

diff --git a/jobs/lttng-ust.yaml b/jobs/lttng-ust.yaml
index 7cf2e152a9c15e134762a9f6c17061d78dcc2571..3da74c1afbf59ad5513e819ecfd431c8f9637c7e 100644 (file)
--- a/jobs/lttng-ust.yaml
+++ b/jobs/lttng-ust.yaml
@@ -313,8 +313,6 @@
     github_name: lttng-ust
     email_to: 'ci-notification@lists.lttng.org, cc:mathieu.desnoyers@efficios.com'
     version:
-      - stable-2.8
-      - stable-2.9
       - stable-2.10
       - stable-2.11
     jobs:
@@ -323,14 +321,14 @@
           arch: !!python/tuple [amd64]
           build: !!python/tuple [std, dist, oot, oot-dist]
           conf: !!python/tuple [std, agents, debug-rcu]
-          liburcu_version: !!python/tuple [stable-0.8, stable-0.10, stable-0.12, master]
+          liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]
           filter: '(build=="std") || (liburcu_version=="master")'
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: portbuild
           arch: !!python/tuple [armhf, arm64, powerpc, ppc64el, i386]
           build: !!python/tuple [std]
           conf: !!python/tuple [std, agents]
-          liburcu_version: !!python/tuple [stable-0.8, stable-0.10, stable-0.12, master]
+          liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]
           filter: ''
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
@@ -348,6 +346,7 @@
           filter: ''
       - 'lttng-ust_{version}_cppcheck'
       - 'lttng-ust_{version}_scan-build'
+
       ## Master ##
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: build
@@ -387,6 +386,7 @@
           version: master
       - 'lttng-ust_{version}_coverity':
           version: master
+
       ## Stable 2.12 ##
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: build
@@ -425,16 +425,27 @@
       - 'lttng-ust_{version}_scan-build':
           version: stable-2.12
 
-      # stable-2.7
+      ## Stable 2.9 ##
+      - 'lttng-ust_{version}_{buildtype}':
+          buildtype: slesbuild
+          version: stable-2.9
+          arch: !!python/tuple [sles12sp2]
+          build: !!python/tuple [std]
+          conf: !!python/tuple [std]
+          liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]
+          filter: ''
+
+      ## Stable 2.8 ##
       - 'lttng-ust_{version}_{buildtype}':
           buildtype: slesbuild
-          version: stable-2.7
+          version: stable-2.8
           arch: !!python/tuple [sles12sp2]
           build: !!python/tuple [std]
           conf: !!python/tuple [std]
-          liburcu_version: !!python/tuple [stable-0.9]
+          liburcu_version: !!python/tuple [stable-0.9, stable-0.10, stable-0.12, master]
           filter: ''
 
+
 - project:
     name: gerrit-lttng-ust
     github_user: lttng