X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-modules.yaml;h=834989d0da2d133ae02f61b25f9ba5c7894ec954;hb=1722d4cb5294835c862fc49261d3730830d71e49;hp=83f7981ea2f19b4208c60bcf3d7d6f8eea4d7019;hpb=e0e247de41b3adfce515f75d0fac58e6082fe3aa;p=lttng-ci.git

diff --git a/jobs/lttng-modules.yaml b/jobs/lttng-modules.yaml
index 83f7981..834989d 100644
--- a/jobs/lttng-modules.yaml
+++ b/jobs/lttng-modules.yaml
@@ -638,33 +638,6 @@
       - cppcheck:
           pattern: 'cppcheck-result.xml'
 
-- job-template:
-    name: lttng-modules_{mversion}_sloccount
-    defaults: lttng-modules
-    description: |
-      The LTTng modules provide Linux kernel tracing capability to the LTTng
-      2.0 tracer toolset.
-
-      This job runs the sloccount utility and generates a trend report.
-
-      <p>Job is managed by Jenkins Job Builder.</p>
-
-    triggers:
-      - pollscm:
-          cron: "@daily"
-
-    builders:
-      - shell: |
-          cloc --by-file --xml --out=cloc.xml src/lttng-modules/
-
-    publishers:
-      - archive:
-          artifacts: 'cloc.xml'
-          allow-empty: false
-      - sloccount:
-          report-files: 'cloc.xml'
-      - workspace-cleanup
-
 
 ## Project
 - project:
@@ -672,58 +645,47 @@
     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: ''
-          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':
+
+      - 'lttng-modules_{mversion}_{buildtype}-vanilla':
           mversion:
-            - stable-2.11
+            - stable-2.12
           buildtype: build
           parambuildtype: build
-          kverfloor: v2.6.36
-          kverceil: ''
-          kverfilter: none
+          kverfloor: v3.0
+          kverceil: v5.18-rc1
+          kverfilter: stable-head
       - 'lttng-modules_{mversion}_fullbuild-vanilla':
           mversion:
-            - stable-2.10
+            - stable-2.12
           buildtype: build
           parambuildtype: build
-          kverfloor: v2.6.36
-          kverceil: v5.7-rc1
+          kverfloor: v3.0
+          kverceil: v5.18-rc1
           kverfilter: none
 
 # RT normal builds
@@ -734,15 +696,11 @@
 
 # Ubuntu normal builds
       - 'lttng-modules_{mversion}_{buildtype}-{uversion}':
-          mversion:
-            - stable-2.10
-            - stable-2.11
-            - stable-2.12
-            - master
           uversion:
             - xenial
             - bionic
             - focal
+            - jammy
           buildtype: build
           parambuildtype: build
           kverfloor: ''
@@ -752,8 +710,7 @@
 # Vanilla crossbuilds
       - 'lttng-modules_{mversion}_{buildtype}-vanilla':
           mversion:
-            - stable-2.11
-            - stable-2.12
+            - stable-2.13
             - master
           buildtype: crossbuild
           parambuildtype: crossbuild
@@ -761,13 +718,17 @@
           kverceil: ''
           kverfilter: stable-head
 
-# Ubuntu cross builds
-      - 'lttng-modules_{mversion}_{buildtype}-{uversion}':
+      - 'lttng-modules_{mversion}_{buildtype}-vanilla':
           mversion:
-            - stable-2.10
-            - stable-2.11
             - stable-2.12
-            - master
+          buildtype: crossbuild
+          parambuildtype: crossbuild
+          kverfloor: v3.18
+          kverceil: v5.18-rc1
+          kverfilter: stable-head
+
+# Ubuntu cross builds
+      - 'lttng-modules_{mversion}_{buildtype}-{uversion}':
           uversion:
             - xenial
             - bionic
@@ -785,13 +746,7 @@
 
 # Misc jobs
       - 'lttng-modules_ALL_trigger-vanilla'
-      - 'lttng-modules_{mversion}_cppcheck':
-          mversion:
-            - stable-2.11
-            - stable-2.12
-            - master
-      - 'lttng-modules_{mversion}_sloccount':
-          mversion: master
+      - 'lttng-modules_{mversion}_cppcheck'
       - 'lttng-modules_{mversion}_coverity':
           mversion: master