X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=jobs%2Fsystem-tests.yaml;h=96aeea2a6bae9394e44afb6029f8875e3b291389;hb=c71443a8f4d36c32eb9c79b94b7d87b81ffc90c8;hp=67e148cc70d61e0d92c2ed8ad1124b1166a6ddf1;hpb=6252703ba33efacb583f10df01b2454c5fde1d74;p=lttng-ci.git

diff --git a/jobs/system-tests.yaml b/jobs/system-tests.yaml
index 67e148c..96aeea2 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
@@ -128,14 +131,14 @@
     description: |
       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
@@ -222,7 +231,7 @@
     description: |
       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:
@@ -332,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/
@@ -376,6 +383,11 @@
 
     project-type: freestyle
     node: 'master'
+    parameters:
+      - bool:
+          name: 'FORCE_JOB_RUN'
+          default: false
+          description: 'Force the child jobs to run'
 
     properties:
       - build-discarder:
@@ -430,8 +442,9 @@
     name: system-tests
     kversion:
       - master
-      - linux-4.4.y
       - linux-4.9.y
+      - linux-4.14.y
+      - linux-4.19.y
     lttngversion:
       - master
       - stable-2.9
@@ -444,9 +457,12 @@
 - project:
     name: system-tests-oldkernel
     kversion:
-      - linux-3.18.y
+      - linux-4.4.y
     lttngversion:
+      - master
       - stable-2.7
+      - stable-2.9
+      - stable-2.10
     jobs:
       - 'vm_tests_k{kversion}_l{lttngversion}':
       - 'baremetal_tests_k{kversion}_l{lttngversion}':