Rename x86 to i386 and amd64

[lttng-ci.git] / jobs / system-tests.yaml

diff --git a/jobs/system-tests.yaml b/jobs/system-tests.yaml
index b0bcc07e71fb2457ef37a64e8e89ed89a228c508..67f32d6efa4c203d1166f63bcbf1aad9fd1dade7 100644 (file)
--- 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,9 +129,9 @@
 - 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:
@@ -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,7 +181,7 @@
     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:
@@ -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/