X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fsystem-tests.yaml;h=4eeded83b2171784e6b684d3e5a2811bb660b3db;hb=8e088f796d5d87d24aa8ff890f122290758cd343;hp=87b92de75b840f428d6c547e58c4ddef6cd3a477;hpb=02126236dc58f0d88d92c2869868af3cac3af71c;p=lttng-ci.git

diff --git a/jobs/system-tests.yaml b/jobs/system-tests.yaml
index 87b92de..4eeded8 100644
--- a/jobs/system-tests.yaml
+++ b/jobs/system-tests.yaml
@@ -4,43 +4,43 @@
     name: 'system_tests_parameters_defaults'
     parameters:
       - string:
-          name: 'tools_commit_id'
+          name: 'LTTNG_TOOLS_COMMIT_ID'
           default: ''
           description: 'The lttng-tools commit id to build.'
       - string:
-          name: 'modules_commit_id'
+          name: 'LTTNG_MODULES_COMMIT_ID'
           default: ''
           description: 'The lttng-modules commit id to build.'
       - string:
-          name: 'ust_commit_id'
+          name: 'LTTNG_UST_COMMIT_ID'
           default: ''
           description: 'The lttng-ust commit id to build.'
       - string:
-          name: 'kernel_tag_id'
+          name: 'KERNEL_TAG_ID'
           default: ''
           description: 'The linux kernel git tag to build against.'
       - string:
-          name: 'kernel_repo'
+          name: 'KERNEL_REPO'
           default: 'git://git-mirror.internal.efficios.com/kernel/stable/linux-stable.git'
           description: 'Linux kernel git repo to checkout the kernel id'
       - string:
-          name: 'tools_repo'
+          name: 'LTTNG_TOOLS_REPO'
           default: 'https://github.com/lttng/lttng-tools.git'
           description: 'LTTng-Tools git repo to checkout the tools id'
       - string:
-          name: 'modules_repo'
+          name: 'LTTNG_MODULES_REPO'
           default: 'https://github.com/lttng/lttng-modules.git'
           description: 'LTTng-Modules git repo to checkout the Modules id'
       - string:
-          name: 'ust_repo'
+          name: 'LTTNG_UST_REPO'
           default: 'https://github.com/lttng/lttng-ust.git'
           description: 'LTTng-UST git repo to checkout the UST id'
 
-- system_tests_publisher_defaults: &system_tests_publisher_defaults
-    name: 'system_tests_publisher_defaults'
+- publisher:
+    name: 'system_tests_email_ext_default'
     publishers:
       - email-ext:
-          recipients: '{obj:email_to}'
+          recipients: 'ci-notification@lists.lttng.org, cc:francis.deslauriers@efficios.com'
           reply-to: ci-notification@lists.lttng.org
           always: false
           unstable: false
@@ -61,26 +61,23 @@
           matrix-trigger: only-parent
           send-to:
             - recipients
-      - workspace-cleanup
 
-## Defaults
-- defaults:
-    name: baremetal_benchmarks
+- job-template:
+    name: vm_tests_k{kversion}_l{lttngversion}
     description: |
-      Runs baremetal kernel benchmarks 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:
-            - 'baremetal-tests'
+            - 'kvm-tests'
 
     wrappers:
       - workspace-cleanup
@@ -90,33 +87,33 @@
           - text:
               credential-id: jenkins_lava_key
               variable: LAVA_JENKINS_TOKEN
-          - file:
-              credential-id: system_tests_storage_key
-              variable: identity_file
+          - text:
+              credential-id: jenkins_lava2_key
+              variable: LAVA2_JENKINS_TOKEN
       - inject:
           properties-content: |
-            BUILD_DEVICE=baremetal
+            BUILD_DEVICE=kvm
+            LTTNG_VERSION={lttngversion}
+
+    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
-      - shell: !include-raw-escape: scripts/system-tests/inject-ssh-commands.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-baremetal-benchmarks.sh
-      - shell: !include-raw-escape: scripts/system-tests/summarize-results.sh
+      - shell: !include-raw-escape: scripts/system-tests/run-kvm-tests.sh
 
     publishers:
-      - archive:
-          artifacts: '*.png,*.csv'
-          stable: true
-          do-not-fingerprint: true
+      - workspace-cleanup
       - email-ext:
           recipients: '{obj:email_to}'
-          reply-to: ci-notification@lists.lttng.org
           always: false
           unstable: false
           first-failure: true
@@ -127,7 +124,7 @@
           failure: false
           second-failure: false
           improvement: false
-          still-failing: false
+          still-failing: true
           success: false
           fixed: false
           fixed-unhealthy: true
@@ -136,100 +133,13 @@
           matrix-trigger: only-parent
           send-to:
             - recipients
-      - image-gallery:
-        - gallery-type: archived-images-gallery
-          title: Results
-          includes: '*.png'
-      - workspace-cleanup
-
-- defaults:
-    name: vm_tests
-    description: |
-      Runs virtual machine kernel tests over different combination of kernel and lttng configurations.
-    project-type: freestyle
-    node: 'master'
-    <<: *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
-      - inject:
-          properties-content: |
-            BUILD_DEVICE=kvm
-
-    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-tests.sh
-
-    <<: *system_tests_publisher_defaults
-
-- defaults:
-    name: vm_tests_fuzzing
-    description: |
-      Runs virtual machine fuzzing tests over different combination of kernel and lttng configurations.
-    project-type: freestyle
-    node: 'master'
-    <<: *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
-      - inject:
-          properties-content: |
-            BUILD_DEVICE=kvm
-
-    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
-
-    <<: *system_tests_publisher_defaults
-
-- defaults:
-    name: baremetal_tests
+- job-template:
+    name: baremetal_tests_k{kversion}_l{lttngversion}
     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: 'master'
+    node: 'amd64'
 
     <<: *system_tests_parameters_defaults
 
@@ -250,9 +160,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
+            LTTNG_VERSION={lttngversion}
+
+    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
@@ -264,15 +183,57 @@
           properties-file: properties.txt
       - shell: !include-raw-escape: scripts/system-tests/run-baremetal-tests.sh
 
-    <<: *system_tests_publisher_defaults
+    publishers:
+      - workspace-cleanup
 
-## Templates
 - job-template:
     name: build_kernel_PARAM
     description: |
       Builds a Linux Kernel and LTTng Modules if necessary
     concurrent: true
-    node: 'x86-64'
+    node: 'amd64'
+
+    parameters:
+      - string:
+          name: 'LTTNG_MODULES_COMMIT_ID'
+          description: 'The lttng-modules commmit to build.'
+      - string:
+          name: 'LTTNG_MODULES_REPO'
+          description: 'The LTTng Modules git repo to fetch from'
+          default: 'git://git-mirror.internal.efficios.com/lttng/lttng-modules.git'
+      - string:
+          name: 'KERNEL_COMMIT_ID'
+          description: 'The kernel commit to build.'
+      - string:
+          name: 'KGITREPO'
+          description: 'The kernel git repo to fetch from'
+      - string:
+          name: 'STORAGE_KERNEL_FOLDER'
+          description: 'Path to store the Kernel image'
+      - string:
+          name: 'STORAGE_KERNEL_IMAGE'
+          description: 'Path to store the Kernel IMAGE'
+      - string:
+          name: 'STORAGE_LINUX_MODULES'
+          description: 'Path to store the Kernel Modules'
+      - string:
+          name: 'STORAGE_LTTNG_MODULES'
+          description: 'Path to store the LTTng Modules'
+      - 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:
@@ -287,6 +248,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:
@@ -309,54 +280,33 @@
           steps:
               - shell: !include-raw-escape: scripts/system-tests/build-modules.sh
 
-    parameters:
-      - string:
-          name: 'LTTNG_MODULES_COMMIT_ID'
-          description: 'The lttng-modules commmit to build.'
-      - string:
-          name: 'LTTNG_MODULES_REPO'
-          description: 'The LTTng Modules git repo to fetch from'
-          default: 'git://git-mirror.internal.efficios.com/lttng/lttng-modules.git'
-      - string:
-          name: 'KERNEL_COMMIT_ID'
-          description: 'The kernel commit to build.'
-      - string:
-          name: 'KGITREPO'
-          description: 'The kernel git repo to fetch from'
-      - string:
-          name: 'STORAGE_KERNEL_FOLDER'
-          description: 'Path to store the Kernel image'
-      - string:
-          name: 'STORAGE_KERNEL_IMAGE'
-          description: 'Path to store the Kernel IMAGE'
-      - string:
-          name: 'STORAGE_LINUX_MODULES'
-          description: 'Path to store the Kernel Modules'
-      - string:
-          name: 'STORAGE_LTTNG_MODULES'
-          description: 'Path to store the LTTng Modules'
-      - string:
-          name: 'BUILD_DEVICE'
-          description: 'The target device. (kvm or baremetal)'
-
     publishers:
       - workspace-cleanup
 
 - job-template:
-    name: system_ALL_trigger
+    name: system_ALL_{test_type}_trigger
     description: |
       This job will trigger the build of jobs when a new tag is push specific
       tracked Linux branches and new commits on LTTng tracked branches
 
     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:
-      - timed: "@daily"
+      - timed: "H 0 * * 1-5"
 
     wrappers:
       - timestamps
@@ -367,85 +317,68 @@
          command:
            !include-raw-escape: scripts/system-tests/system-trigger.groovy
 
-    <<: *system_tests_publisher_defaults
-
-- 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
+    publishers:
+      - system_tests_email_ext_default
 
-- 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
+# Only build the "supported" version against the master kernel since
+# "unsupported" version do not get backport for new kernel.
 - project:
-    name: system-tests
-    email_to: 'ci-notification@lists.lttng.org, cc:francis.deslauriers@efficios.com'
+    name: system-tests-supported-kmaster
+    email_to: 'ci-notification@lists.lttng.org, cc:jgalar@efficios.com'
     kversion:
       - master
-      - linux-4.4.y
-      - linux-4.9.y
     lttngversion:
       - master
-      - stable-2.9
-      - stable-2.10
+      - stable-2.12
+      - stable-2.13
     jobs:
       - 'vm_tests_k{kversion}_l{lttngversion}'
-      - 'baremetal_benchmarks_k{kversion}_l{lttngversion}'
       - 'baremetal_tests_k{kversion}_l{lttngversion}'
 
+# Test against particular linux version.
 - project:
-    name: system-tests-oldkernel
-    email_to: 'ci-notification@lists.lttng.org, cc:francis.deslauriers@efficios.com'
+    name: system-tests
+    email_to: 'ci-notification@lists.lttng.org, cc:jgalar@efficios.com'
     kversion:
-      - linux-3.18.y
-      - linux-4.4.y
+      - canary
+      - linux-4.9.y
+      - linux-4.14.y
+      - linux-4.19.y
+      - linux-5.4.y
+      - linux-5.10.y
+      - linux-5.15.y
+      - linux-5.16.y
     lttngversion:
-      - stable-2.7
+      - canary
+      - master
+      - stable-2.12
+      - stable-2.13
     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}'
+      - 'baremetal_tests_k{kversion}_l{lttngversion}'
 - project:
-    name: system-tests-canary
-    email_to: 'ci-notification@lists.lttng.org, cc:francis.deslauriers@efficios.com'
+    name: system-tests-vm-only
+    email_to: 'ci-notification@lists.lttng.org, cc:jgalar@efficios.com'
+    kversion:
+      - linux-3.18.y
+    lttngversion:
+      - master
+      - stable-2.12
+      - stable-2.13
     jobs:
-      - 'vm_tests_canary'
-      - 'baremetal_tests_canary'
-      - 'baremetal_benchmarks_canary'
+      - 'vm_tests_k{kversion}_l{lttngversion}'
 
-- project:
-    name: system-fuzzing-tests
-    email_to: 'ci-notification@lists.lttng.org, cc:francis.deslauriers@efficios.com'
-    kversion: master
-    lttngversion: master
-    jobs:
-      - 'vm_tests_fuzzing_k{kversion}_l{lttngversion}'
 - project:
     name: system-general
-    email_to: 'ci-notification@lists.lttng.org, cc:francis.deslauriers@efficios.com'
+    test_type:
+      - vm_tests
+      - baremetal_tests
     jobs:
       - 'build_kernel_PARAM'
-      - 'system_ALL_trigger'
+      - 'system_ALL_{test_type}_trigger'