X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fsystem-tests.yaml;h=4eeded83b2171784e6b684d3e5a2811bb660b3db;hb=25142be0a62dd6b5076c7e7ca2ac195a619ee55b;hp=dd94ef57b80e70cbd714a7ca2f70977bd16be870;hpb=30b09a0e91d2c21e6531c0a3935f9b65d1deb450;p=lttng-ci.git

diff --git a/jobs/system-tests.yaml b/jobs/system-tests.yaml
index dd94ef5..4eeded8 100644
--- a/jobs/system-tests.yaml
+++ b/jobs/system-tests.yaml
@@ -62,71 +62,6 @@
           send-to:
             - recipients
 
-## Templates
-- job-template:
-    name: baremetal_benchmarks_k{kversion}_l{lttngversion}
-    description: |
-      Runs baremetal kernel benchmarks over different combination of kernel and lttng configurations.
-    project-type: freestyle
-    node: 'amd64'
-
-    <<: *system_tests_parameters_defaults
-
-    properties:
-      - build-discarder:
-          num-to-keep: 10
-      - throttle:
-          max-total: 2
-          option: 'category'
-          categories:
-            - 'baremetal-tests'
-
-    wrappers:
-      - workspace-cleanup
-      - timestamps
-      - ansicolor
-      - credentials-binding:
-          - text:
-              credential-id: jenkins_lava_key
-              variable: LAVA_JENKINS_TOKEN
-          - text:
-              credential-id: jenkins_lava2_key
-              variable: LAVA2_JENKINS_TOKEN
-          - file:
-              credential-id: system_tests_storage_key
-              variable: identity_file
-      - inject:
-          properties-content: |
-            BUILD_DEVICE=baremetal
-            LTTNG_VERSION={lttngversion}
-    scm:
-      - git:
-          url: https://github.com/lttng/lttng-ci
-          basedir: src/lttng-ci/
-
-    builders:
-      - shell: !include-raw-escape: scripts/system-tests/generate-properties-master.sh
-      - shell: !include-raw-escape: scripts/system-tests/inject-ssh-commands.sh
-      - trigger-builds:
-        - project: "build_kernel_PARAM"
-          property-file: 'properties.txt'
-          block: true
-      - inject:
-          properties-file: properties.txt
-      - shell: !include-raw-escape: scripts/system-tests/run-baremetal-benchmarks.sh
-      - shell: !include-raw-escape: scripts/system-tests/summarize-results.sh
-
-    publishers:
-      - archive:
-          artifacts: '*.png,*.csv'
-          stable: true
-          do-not-fingerprint: true
-      - image-gallery:
-        - gallery-type: archived-images-gallery
-          title: Results
-          includes: '*.png'
-      - workspace-cleanup
-
 - job-template:
     name: vm_tests_k{kversion}_l{lttngversion}
     description: |
@@ -391,27 +326,41 @@
 # They are scheduled once a day always on the same (LTTng, Kernel) code. If any
 # of those jobs fails, it means that there is an issue with the configuration
 
+# Only build the "supported" version against the master kernel since
+# "unsupported" version do not get backport for new kernel.
+- project:
+    name: system-tests-supported-kmaster
+    email_to: 'ci-notification@lists.lttng.org, cc:jgalar@efficios.com'
+    kversion:
+      - master
+    lttngversion:
+      - master
+      - stable-2.12
+      - stable-2.13
+    jobs:
+      - 'vm_tests_k{kversion}_l{lttngversion}'
+      - 'baremetal_tests_k{kversion}_l{lttngversion}'
+
+# Test against particular linux version.
 - project:
     name: system-tests
     email_to: 'ci-notification@lists.lttng.org, cc:jgalar@efficios.com'
     kversion:
       - canary
-      - master
-      - linux-4.4.y
       - linux-4.9.y
       - linux-4.14.y
       - linux-4.19.y
-      - linux-5.0.y
-      - linux-5.1.y
+      - linux-5.4.y
+      - linux-5.10.y
+      - linux-5.15.y
+      - linux-5.16.y
     lttngversion:
       - canary
       - master
-      - stable-2.10
-      - stable-2.11
       - stable-2.12
+      - stable-2.13
     jobs:
       - 'vm_tests_k{kversion}_l{lttngversion}'
-      - 'baremetal_benchmarks_k{kversion}_l{lttngversion}'
       - 'baremetal_tests_k{kversion}_l{lttngversion}'
 - project:
     name: system-tests-vm-only
@@ -420,9 +369,8 @@
       - linux-3.18.y
     lttngversion:
       - master
-      - stable-2.10
-      - stable-2.11
       - stable-2.12
+      - stable-2.13
     jobs:
       - 'vm_tests_k{kversion}_l{lttngversion}'
 
@@ -431,7 +379,6 @@
     test_type:
       - vm_tests
       - baremetal_tests
-      - baremetal_benchmarks
     jobs:
       - 'build_kernel_PARAM'
       - 'system_ALL_{test_type}_trigger'