From cec8f6e182a9096bd46bf28645240647bea90c8d Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Mon, 28 Mar 2022 14:44:59 -0400
Subject: [PATCH] jjb: lttng-modules: remove 2.10 and 2.11 jobs

Change-Id: Ie7f066447ee507f34e852509ff883fba34ced90b
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
 jobs/lttng-modules.yaml                      | 62 ++------------------
 scripts/lttng-modules/trigger-vanilla.groovy |  4 --
 2 files changed, 5 insertions(+), 61 deletions(-)

diff --git a/jobs/lttng-modules.yaml b/jobs/lttng-modules.yaml
index d345d5f..6195f2c 100644
--- a/jobs/lttng-modules.yaml
+++ b/jobs/lttng-modules.yaml
@@ -645,61 +645,25 @@
     github_user: lttng
     github_name: lttng-modules
     email_to: 'ci-notification@lists.lttng.org, cc:mathieu.desnoyers@efficios.com'
+    mversion:
+      - stable-2.12
+      - stable-2.13
+      - master
     jobs:
 
 # Vanilla normal builds
       - 'lttng-modules_{mversion}_{buildtype}-vanilla':
-          mversion:
-            - stable-2.12
-            - stable-2.13
-            - master
           buildtype: build
           parambuildtype: build
           kverfloor: v3.0
           kverceil: ''
           kverfilter: stable-head
-      - 'lttng-modules_{mversion}_{buildtype}-vanilla':
-          mversion:
-            - stable-2.11
-          buildtype: build
-          parambuildtype: build
-          kverfloor: v2.6.36
-          kverceil: v5.15
-          kverfilter: stable-head
-      - 'lttng-modules_{mversion}_{buildtype}-vanilla':
-          mversion:
-            - stable-2.10
-          buildtype: build
-          parambuildtype: build
-          kverfloor: v2.6.36
-          kverceil: v5.7-rc1
-          kverfilter: stable-head
       - 'lttng-modules_{mversion}_fullbuild-vanilla':
-          mversion:
-            - stable-2.12
-            - stable-2.13
-            - master
           buildtype: build
           parambuildtype: build
           kverfloor: v3.0
           kverceil: ''
           kverfilter: none
-      - 'lttng-modules_{mversion}_fullbuild-vanilla':
-          mversion:
-            - stable-2.11
-          buildtype: build
-          parambuildtype: build
-          kverfloor: v2.6.36
-          kverceil: v5.15
-          kverfilter: none
-      - 'lttng-modules_{mversion}_fullbuild-vanilla':
-          mversion:
-            - stable-2.10
-          buildtype: build
-          parambuildtype: build
-          kverfloor: v2.6.36
-          kverceil: v5.7-rc1
-          kverfilter: none
 
 # RT normal builds
       - 'lttng-modules_{mversion}_build-rt':
@@ -709,10 +673,6 @@
 
 # Ubuntu normal builds
       - 'lttng-modules_{mversion}_{buildtype}-{uversion}':
-          mversion:
-            - stable-2.12
-            - stable-2.13
-            - master
           uversion:
             - xenial
             - bionic
@@ -725,10 +685,6 @@
 
 # Vanilla crossbuilds
       - 'lttng-modules_{mversion}_{buildtype}-vanilla':
-          mversion:
-            - stable-2.12
-            - stable-2.13
-            - master
           buildtype: crossbuild
           parambuildtype: crossbuild
           kverfloor: v3.18
@@ -737,10 +693,6 @@
 
 # Ubuntu cross builds
       - 'lttng-modules_{mversion}_{buildtype}-{uversion}':
-          mversion:
-            - stable-2.12
-            - stable-2.13
-            - master
           uversion:
             - xenial
             - bionic
@@ -758,11 +710,7 @@
 
 # Misc jobs
       - 'lttng-modules_ALL_trigger-vanilla'
-      - 'lttng-modules_{mversion}_cppcheck':
-          mversion:
-            - stable-2.12
-            - stable-2.13
-            - master
+      - 'lttng-modules_{mversion}_cppcheck'
       - 'lttng-modules_{mversion}_coverity':
           mversion: master
 
diff --git a/scripts/lttng-modules/trigger-vanilla.groovy b/scripts/lttng-modules/trigger-vanilla.groovy
index 87bfd23..2ba5328 100644
--- a/scripts/lttng-modules/trigger-vanilla.groovy
+++ b/scripts/lttng-modules/trigger-vanilla.groovy
@@ -29,13 +29,9 @@ def trigger_jobs = [
   'lttng-modules_master_build-vanilla',
   'lttng-modules_stable-2.13_build-vanilla',
   'lttng-modules_stable-2.12_build-vanilla',
-  'lttng-modules_stable-2.11_build-vanilla',
-  'lttng-modules_stable-2.10_build-vanilla',
   'lttng-modules_master_crossbuild-vanilla',
   'lttng-modules_stable-2.13_crossbuild-vanilla',
   'lttng-modules_stable-2.12_crossbuild-vanilla',
-  'lttng-modules_stable-2.11_crossbuild-vanilla',
-  'lttng-modules_stable-2.10_crossbuild-vanilla',
 ]
 
 def previous_tags = []
-- 
2.34.1