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

diff --git a/jobs/system-tests.yaml b/jobs/system-tests.yaml
index 1dedd47..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,12 +89,19 @@
           - 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
+    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
@@ -122,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'
@@ -144,10 +151,18 @@
           - 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:
@@ -166,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'
@@ -186,10 +201,18 @@
           - 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:
@@ -206,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
 
@@ -229,10 +252,18 @@
           - 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
 
+    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:
@@ -252,7 +283,7 @@
     description: |
       Builds a Linux Kernel and LTTng Modules if necessary
     concurrent: true
-    node: 'x86-64'
+    node: 'amd64'
 
     parameters:
       - string:
@@ -283,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:
@@ -297,6 +340,16 @@
               credential-id: system_tests_storage_key
               variable: identity_file
 
+    scm:
+      - git:
+          url: https://github.com/lttng/lttng-ci
+          basedir: src/lttng-ci/
+      - git:
+          url : $LTTNG_MODULES_REPO
+          basedir: src/lttng-modules/
+          branches:
+            - $LTTNG_MODULES_COMMIT_ID
+
     builders:
       - shell: !include-raw-escape: scripts/system-tests/generate-properties-slave.sh
       - inject:
@@ -330,13 +383,18 @@
 
     project-type: freestyle
     node: 'master'
+    parameters:
+      - bool:
+          name: 'FORCE_JOB_RUN'
+          default: false
+          description: 'Force the child jobs to run'
 
     properties:
       - build-discarder:
           num-to-keep: 10
 
     triggers:
-      - timed: "@daily"
+      - timed: "H 0 * * 1-5"
 
     wrappers:
       - timestamps
@@ -384,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
@@ -398,10 +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}':