X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fsystem-tests.yaml;h=7a39ea28a9da7294aceea811472c0ac902268f66;hb=20defd5e328ab5a054111f3657ebc0323a3a2f7f;hp=ea6dd475060e2e7339078e7e2f96cf549f7bf5a0;hpb=49499ecb0a8345e5cc6ff01556656b0dadfe23f1;p=lttng-ci.git

diff --git a/jobs/system-tests.yaml b/jobs/system-tests.yaml
index ea6dd47..7a39ea2 100644
--- a/jobs/system-tests.yaml
+++ b/jobs/system-tests.yaml
@@ -68,7 +68,7 @@
     description: |
       Runs baremetal kernel benchmarks over different combination of kernel and lttng configurations.
     project-type: freestyle
-    node: 'x86-64'
+    node: 'amd64'
 
     <<: *system_tests_parameters_defaults
 
@@ -89,6 +89,9 @@
           - 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
@@ -126,16 +129,16 @@
 - defaults:
     name: vm_tests
     description: |
-      Runs virtual machine kernel tests over different combination of kernel and lttng configurations.
+      Runs root_regression and root_destructive_tests on a virtual machine over different combinations of kernel and lttng configurations.
     project-type: freestyle
-    node: 'x86-64'
+    node: 'amd64'
     <<: *system_tests_parameters_defaults
 
     properties:
       - build-discarder:
           num-to-keep: 10
       - throttle:
-          max-total: 2
+          max-total: 4
           option: 'category'
           categories:
             - 'kvm-tests'
@@ -148,6 +151,9 @@
           - 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
@@ -175,14 +181,14 @@
     description: |
       Runs virtual machine fuzzing tests over different combination of kernel and lttng configurations.
     project-type: freestyle
-    node: 'x86-64'
+    node: 'amd64'
     <<: *system_tests_parameters_defaults
 
     properties:
       - build-discarder:
           num-to-keep: 10
       - throttle:
-          max-total: 2
+          max-total: 4
           option: 'category'
           categories:
             - 'kvm-tests'
@@ -195,6 +201,9 @@
           - 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
@@ -220,9 +229,9 @@
 - defaults:
     name: baremetal_tests
     description: |
-      Runs baremetal kernel tests over different combination of kernel and lttng configurations.
+      Runs perf_regression tests on a baremetal machine over different combinations of kernel and lttng configurations.
     project-type: freestyle
-    node: 'x86-64'
+    node: 'amd64'
 
     <<: *system_tests_parameters_defaults
 
@@ -243,6 +252,9 @@
           - 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=baremetal
@@ -271,7 +283,7 @@
     description: |
       Builds a Linux Kernel and LTTng Modules if necessary
     concurrent: true
-    node: 'x86-64'
+    node: 'amd64'
 
     parameters:
       - string:
@@ -302,6 +314,18 @@
       - string:
           name: 'BUILD_DEVICE'
           description: 'The target device. (kvm or baremetal)'
+      - string:
+          name: 'S3_STORAGE_KERNEL_FOLDER'
+          description: 'Path to store the Kernel image'
+      - string:
+          name: 'S3_STORAGE_KERNEL_IMAGE'
+          description: 'Path to store the Kernel IMAGE'
+      - string:
+          name: 'S3_STORAGE_LINUX_MODULES'
+          description: 'Path to store the Kernel Modules'
+      - string:
+          name: 'S3_STORAGE_LTTNG_MODULES'
+          description: 'Path to store the LTTng Modules'
 
     properties:
       - build-discarder:
@@ -320,11 +344,6 @@
       - git:
           url: https://github.com/lttng/lttng-ci
           basedir: src/lttng-ci/
-      - git:
-          url : $KGITREPO
-          basedir: src/linux/
-          branches:
-            - $KERNEL_COMMIT_ID
       - git:
           url : $LTTNG_MODULES_REPO
           basedir: src/lttng-modules/
@@ -364,14 +383,22 @@
 
     project-type: freestyle
     node: 'master'
+    parameters:
+      - bool:
+          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:
           num-to-keep: 10
 
     triggers:
-      - pollscm:
-          cron: "* * * * 1-5"
+      - timed: "H 0 * * 1-5"
 
     wrappers:
       - timestamps
@@ -421,6 +448,10 @@
       - 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:
       - master
       - stable-2.9
@@ -429,17 +460,16 @@
       - '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
+      - master
+      - stable-2.9
+      - stable-2.10
     jobs:
-      - 'vm_tests_k{kversion}_l{lttngversion}':
-      - 'baremetal_tests_k{kversion}_l{lttngversion}':
-      - 'baremetal_benchmarks_k{kversion}_l{lttngversion}':
+      - 'vm_tests_k{kversion}_l{lttngversion}'
 
 - project:
     name: system-tests-canary