X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fsystem-tests.yaml;h=49ae463138f283786058877b9d8b277754c4d574;hb=64ed2e0384d168574a1455d384c25db1ad00440d;hp=f5f1dd29fc598fcf152a6abbb9e0447daa91b25f;hpb=e000d7197f29ae8d9df7b10a642ae751886c4295;p=lttng-ci.git

diff --git a/jobs/system-tests.yaml b/jobs/system-tests.yaml
index f5f1dd2..49ae463 100644
--- a/jobs/system-tests.yaml
+++ b/jobs/system-tests.yaml
@@ -62,9 +62,9 @@
           send-to:
             - recipients
 
-## Defaults
-- defaults:
-    name: baremetal_benchmarks
+## 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
@@ -98,6 +98,7 @@
       - inject:
           properties-content: |
             BUILD_DEVICE=baremetal
+            LTTNG_VERSION={lttngversion}
     scm:
       - git:
           url: https://github.com/lttng/lttng-ci
@@ -126,8 +127,8 @@
           includes: '*.png'
       - workspace-cleanup
 
-- defaults:
-    name: vm_tests
+- job-template:
+    name: vm_tests_k{kversion}_l{lttngversion}
     description: |
       Runs root_regression and root_destructive_tests on a virtual machine over different combinations of kernel and lttng configurations.
     project-type: freestyle
@@ -138,7 +139,7 @@
       - build-discarder:
           num-to-keep: 10
       - throttle:
-          max-total: 2
+          max-total: 4
           option: 'category'
           categories:
             - 'kvm-tests'
@@ -157,6 +158,7 @@
       - inject:
           properties-content: |
             BUILD_DEVICE=kvm
+            LTTNG_VERSION={lttngversion}
 
     scm:
       - git:
@@ -176,58 +178,8 @@
     publishers:
       - workspace-cleanup
 
-- defaults:
-    name: vm_tests_fuzzing
-    description: |
-      Runs virtual machine fuzzing tests 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:
-            - 'kvm-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
-      - inject:
-          properties-content: |
-            BUILD_DEVICE=kvm
-
-    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
-      - 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-kvm-fuzzing-tests.sh
-
-    publishers:
-      - workspace-cleanup
-
-- defaults:
-    name: baremetal_tests
+- job-template:
+    name: baremetal_tests_k{kversion}_l{lttngversion}
     description: |
       Runs perf_regression tests on a baremetal machine over different combinations of kernel and lttng configurations.
     project-type: freestyle
@@ -258,6 +210,7 @@
       - inject:
           properties-content: |
             BUILD_DEVICE=baremetal
+            LTTNG_VERSION={lttngversion}
 
     scm:
       - git:
@@ -277,7 +230,6 @@
     publishers:
       - workspace-cleanup
 
-## Templates
 - job-template:
     name: build_kernel_PARAM
     description: |
@@ -388,6 +340,10 @@
           name: 'FORCE_JOB_RUN'
           default: false
           description: 'Force the child jobs to run'
+      - bool:
+          name: 'FORCE_FAILED_JOB_RUN'
+          default: false
+          description: 'Force the failed child jobs to run'
 
     properties:
       - build-discarder:
@@ -408,75 +364,45 @@
     publishers:
       - system_tests_email_ext_default
 
-- job-template:
-    name: baremetal_benchmarks_k{kversion}_l{lttngversion}
-    defaults: baremetal_benchmarks
-- job-template:
-    name: vm_tests_k{kversion}_l{lttngversion}
-    defaults: vm_tests
-- job-template:
-    name: baremetal_tests_k{kversion}_l{lttngversion}
-    defaults: baremetal_tests
-
-- job-template:
-    name: vm_tests_fuzzing_k{kversion}_l{lttngversion}
-    defaults: vm_tests_fuzzing
+## Project
 
 # Canary jobs are made to confirm that the whole Lava pipeline is working.
 # 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
-- job-template:
-    name: baremetal_benchmarks_canary
-    defaults: baremetal_benchmarks
-
-- job-template:
-    name: baremetal_tests_canary
-    defaults: baremetal_tests
-
-- job-template:
-    name: vm_tests_canary
-    defaults: vm_tests
 
-## Project
 - project:
     name: system-tests
     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
     lttngversion:
+      - canary
       - master
-      - stable-2.9
       - stable-2.10
+      - stable-2.11
+      - stable-2.12
     jobs:
       - 'vm_tests_k{kversion}_l{lttngversion}'
       - 'baremetal_benchmarks_k{kversion}_l{lttngversion}'
       - 'baremetal_tests_k{kversion}_l{lttngversion}'
-
 - project:
-    name: system-tests-oldkernel
+    name: system-tests-vm-only
     kversion:
       - linux-3.18.y
     lttngversion:
-      - stable-2.7
-    jobs:
-      - 'vm_tests_k{kversion}_l{lttngversion}':
-      - 'baremetal_tests_k{kversion}_l{lttngversion}':
-      - 'baremetal_benchmarks_k{kversion}_l{lttngversion}':
-
-- project:
-    name: system-tests-canary
+      - master
+      - stable-2.10
+      - stable-2.11
+      - stable-2.12
     jobs:
-      - 'vm_tests_canary'
-      - 'baremetal_tests_canary'
-      - 'baremetal_benchmarks_canary'
+      - 'vm_tests_k{kversion}_l{lttngversion}'
 
-- project:
-    name: system-fuzzing-tests
-    kversion: master
-    lttngversion: master
-    jobs:
-      - 'vm_tests_fuzzing_k{kversion}_l{lttngversion}'
 - project:
     name: system-general
     test_type: