X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-baremetal-tests.yaml;h=266c2d41c7f4b60c253cd6ac47bc5533a030517e;hb=a46ed0a6eb1d2104563f0978398791519e90d82d;hp=e1a3b6a5773d8ca531bff2dd8da423ff66163344;hpb=594c12df5447f3bcb18bf003a95c5ce9263f2884;p=lttng-ci.git

diff --git a/jobs/lttng-baremetal-tests.yaml b/jobs/lttng-baremetal-tests.yaml
index e1a3b6a..266c2d4 100644
--- a/jobs/lttng-baremetal-tests.yaml
+++ b/jobs/lttng-baremetal-tests.yaml
@@ -6,15 +6,16 @@
     triggers:
       - pollscm:
           cron: "H * * * 1-5"
-    logrotate:
-      numToKeep: 10
 
     properties:
+      - build-discarder:
+          num-to-keep: 10
       - throttle:
           max-total: 2
           option: 'category'
           categories:
             - 'baremetal-tests'
+
     project-type: freestyle
     node: 'x86-64'
     wrappers:
@@ -33,6 +34,7 @@
             TOOLS_BRANCH={lttngversion}
             UST_BRANCH={lttngversion}
             BUILD_DEVICE=baremetal
+
     publishers:
       - archive:
           artifacts: '*.png,*.csv'
@@ -45,6 +47,7 @@
           title: Results
           includes: '*.png'
       - workspace-cleanup
+
     scm:
       - git:
           url: git://git-mirror.internal.efficios.com/lttng/lttng-tools.git
@@ -83,23 +86,26 @@
       - shell: !include-raw-escape: scripts/lttng-baremetal-tests/run-baremetal-benchmarks.sh
       - shell: !include-raw-escape: scripts/lttng-baremetal-tests/summarize-results.sh
 
+
 - defaults:
     name: vm_tests
     description: |
       Runs baremetal kernel tests over different combination of kernel and lttng configurations.
     project-type: freestyle
     node: 'master'
+
     properties:
+      - build-discarder:
+          num-to-keep: 10
       - throttle:
           max-total: 2
           option: 'category'
           categories:
             - 'kvm-tests'
+
     triggers:
       - pollscm:
           cron: "H * * * 1-5"
-    logrotate:
-      numToKeep: 10
 
     wrappers:
       - workspace-cleanup
@@ -114,6 +120,7 @@
             BUILD_DEVICE=kvm
             TOOLS_BRANCH={lttngversion}
             UST_BRANCH={lttngversion}
+
     scm:
       - git:
           url: git://git-mirror.internal.efficios.com/lttng/lttng-tools.git
@@ -160,23 +167,74 @@
           properties-file: properties.txt
       - shell: !include-raw-escape: scripts/lttng-baremetal-tests/run-kvm-tests.sh
 
+
+- defaults:
+    name: vm_tests_kmainline
+    defaults: vm_tests
+
+    triggers:
+      - pollscm:
+          cron: "0 1 * * 1-5"
+
+    wrappers:
+      - workspace-cleanup
+      - timestamps
+      - ansicolor
+      - credentials-binding:
+          - text:
+              credential-id: jenkins_lava_key
+              variable: LAVA_JENKINS_TOKEN
+      - inject:
+          properties-content: |
+            TOOLS_BRANCH={lttngversion}
+            MODULES_BRANCH={lttngversion}
+            UST_BRANCH={lttngversion}
+            BUILD_DEVICE=baremetal
+    scm:
+      - git:
+          url: git://git-mirror.internal.efficios.com/lttng/lttng-tools.git
+          branches:
+            - "{lttngversion}"
+          shallow-clone: true
+          skip-tag: true
+          fastpoll: true
+          basedir: src/lttng-tools
+      - git:
+          url: git://git-mirror.internal.efficios.com/lttng/lttng-modules.git
+          branches:
+            - "{lttngversion}"
+          shallow-clone: true
+          skip-tag: true
+          fastpoll: true
+          basedir: src/lttng-modules
+      - git:
+          url: git://git-mirror.internal.efficios.com/kernel/torvalds/linux.git
+          refspec: "+refs/tags/*:refs/remotes/origin/tags/*"
+          branches:
+            - "master"
+          fastpoll: true
+          basedir: src/linux
+
+
 - defaults:
     name: baremetal_tests
     description: |
       Runs baremetal kernel tests over different combination of kernel and lttng configurations.
     project-type: freestyle
     node: 'master'
+
     properties:
+      - build-discarder:
+          num-to-keep: 10
       - throttle:
           max-total: 2
           option: 'category'
           categories:
             - 'baremetal-tests'
+
     triggers:
       - pollscm:
           cron: "H * * * 1-5"
-    logrotate:
-      numToKeep: 10
 
     wrappers:
       - workspace-cleanup
@@ -190,6 +248,7 @@
           properties-content: |
             UST_BRANCH={lttngversion}
             BUILD_DEVICE=baremetal
+
     scm:
       - git:
           url: git://git-mirror.internal.efficios.com/lttng/lttng-tools.git
@@ -236,6 +295,7 @@
           properties-file: properties.txt
       - shell: !include-raw-escape: scripts/lttng-baremetal-tests/run-baremetal-tests.sh
 
+
 - job-template:
     name: baremetal_benchmarks_k{kversion}_l{lttngversion}
     defaults: baremetal_benchmarks
@@ -246,6 +306,7 @@
     name: baremetal_tests_k{kversion}_l{lttngversion}
     defaults: baremetal_tests
 
+
 # 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
@@ -264,58 +325,32 @@
     defaults: baremetal_benchmarks
     triggers:
       - timed: "0 1 * * 1-5"
+- job-template:
+    name: vm_tests_kmainline_l{lttngversion}
+    defaults: vm_tests_kmainline
 
 - job-template:
-    name: vm_tests_kmainline_t{toolsversion}_m{modulesversion}_u{ustversion}
-    defaults: vm_tests
-    triggers:
-      - pollscm:
-          cron: "0 1 * * 1-5"
-    wrappers:
-      - workspace-cleanup
-      - timestamps
-      - ansicolor
-      - credentials-binding:
-          - text:
-              credential-id: jenkins_lava_key
-              variable: LAVA_JENKINS_TOKEN
+    name: vm_tests_fuzzing_kmainline_l{lttngversion}
+    defaults: vm_tests_kmainline
+
+    builders:
+      - shell: !include-raw-escape: scripts/lttng-baremetal-tests/generate-properties-master.sh
+      - trigger-builds:
+        - project: "build_kernel_PARAM"
+          property-file: 'properties.txt'
+          block: true
       - inject:
-          properties-content: |
-            TOOLS_BRANCH={toolsversion}
-            MODULES_BRANCH={modulesversion}
-            UST_BRANCH={ustversion}
-            BUILD_DEVICE=baremetal
-    scm:
-      - git:
-          url: git://git-mirror.internal.efficios.com/lttng/lttng-tools.git
-          branches:
-            - "{toolsversion}"
-          shallow-clone: true
-          skip-tag: true
-          fastpoll: true
-          basedir: src/lttng-tools
-      - git:
-          url: git://git-mirror.internal.efficios.com/lttng/lttng-modules.git
-          branches:
-            - "{modulesversion}"
-          shallow-clone: true
-          skip-tag: true
-          fastpoll: true
-          basedir: src/lttng-modules
-      - git:
-          url: git://git-mirror.internal.efficios.com/kernel/torvalds/linux.git
-          refspec: "+refs/tags/*:refs/remotes/origin/tags/*"
-          branches:
-            - "master"
-          fastpoll: true
-          basedir: src/linux
+          properties-file: properties.txt
+      - shell: !include-raw-escape: scripts/lttng-baremetal-tests/run-kvm-fuzzing-tests.sh
 
 - job-template:
-    name: baremetal_tests_kmainline_t{toolsversion}_m{modulesversion}_u{ustversion}
+    name: baremetal_tests_kmainline_l{lttngversion}
     defaults: baremetal_tests
+
     triggers:
       - pollscm:
           cron: "0 1 * * 1-5"
+
     wrappers:
       - workspace-cleanup
       - timestamps
@@ -326,15 +361,16 @@
               variable: LAVA_JENKINS_TOKEN
       - inject:
           properties-content: |
-            TOOLS_BRANCH={toolsversion}
-            MODULES_BRANCH={modulesversion}
-            UST_BRANCH={ustversion}
+            TOOLS_BRANCH={lttngversion}
+            MODULES_BRANCH={lttngversion}
+            UST_BRANCH={lttngversion}
             BUILD_DEVICE=baremetal
+
     scm:
       - git:
           url: git://git-mirror.internal.efficios.com/lttng/lttng-tools.git
           branches:
-            - "{toolsversion}"
+            - "{lttngversion}"
           shallow-clone: true
           skip-tag: true
           fastpoll: true
@@ -342,7 +378,7 @@
       - git:
           url: git://git-mirror.internal.efficios.com/lttng/lttng-modules.git
           branches:
-            - "{modulesversion}"
+            - "{lttngversion}"
           shallow-clone: true
           skip-tag: true
           fastpoll: true
@@ -354,12 +390,16 @@
             - "master"
           fastpoll: true
           basedir: src/linux
+
+
 - job-template:
-    name: baremetal_benchmarks_kmainline_t{toolsversion}_m{modulesversion}_u{ustversion}
+    name: baremetal_benchmarks_kmainline_l{lttngversion}
     defaults: baremetal_benchmarks
+
     triggers:
       - pollscm:
           cron: "0 1 * * 1-5"
+
     wrappers:
       - workspace-cleanup
       - timestamps
@@ -373,15 +413,16 @@
               variable: identity_file
       - inject:
           properties-content: |
-            TOOLS_BRANCH={toolsversion}
-            MODULES_BRANCH={modulesversion}
-            UST_BRANCH={ustversion}
+            TOOLS_BRANCH={lttngversion}
+            MODULES_BRANCH={lttngversion}
+            UST_BRANCH={lttngversion}
             BUILD_DEVICE=baremetal
+
     scm:
       - git:
           url: git://git-mirror.internal.efficios.com/lttng/lttng-tools.git
           branches:
-            - "{toolsversion}"
+            - "{lttngversion}"
           shallow-clone: true
           skip-tag: true
           fastpoll: true
@@ -389,7 +430,7 @@
       - git:
           url: git://git-mirror.internal.efficios.com/lttng/lttng-modules.git
           branches:
-            - "{modulesversion}"
+            - "{lttngversion}"
           shallow-clone: true
           skip-tag: true
           fastpoll: true
@@ -402,17 +443,18 @@
           fastpoll: true
           basedir: src/linux
 
+
 - job:
     name: build_kernel_PARAM
     description: |
       Builds a Linux Kernel and LTTng Modules if necessary
-    defaults: global
     concurrent: true
-
-    logrotate:
-      numToKeep: 100
     node: 'x86-64'
 
+    properties:
+      - build-discarder:
+          num-to-keep: 100
+
     wrappers:
       - workspace-cleanup
       - timestamps
@@ -421,6 +463,7 @@
           - file:
               credential-id: system_tests_storage_key
               variable: identity_file
+
     builders:
       - shell: !include-raw-escape: scripts/lttng-baremetal-tests/generate-properties-slave.sh
       - inject:
@@ -472,20 +515,22 @@
       - string:
           name: 'BUILD_DEVICE'
           description: 'The target device. (kvm or baremetal)'
+
     publishers:
       - workspace-cleanup
 
+
 ## Project
 - project:
     name: lttng-kernel-tests
     kversion:
       - linux-4.4.y
-      - linux-4.8.y
+      - linux-4.9.y
       - v4.8.1
     lttngversion:
       - master
-      - stable-2.8
       - stable-2.9
+      - stable-2.10
     jobs:
       - 'vm_tests_k{kversion}_l{lttngversion}'
       - 'baremetal_benchmarks_k{kversion}_l{lttngversion}'
@@ -516,13 +561,10 @@
 
 - project:
     name: lttng-kernel-tests-mainline
-    toolsversion:
-      - v2.9.3
-    ustversion:
-      - v2.9.0
-    modulesversion:
-      - stable-2.9
+    lttngversion:
+      - master
     jobs:
-      - 'vm_tests_kmainline_t{toolsversion}_m{modulesversion}_u{ustversion}'
-      - 'baremetal_tests_kmainline_t{toolsversion}_m{modulesversion}_u{ustversion}'
-      - 'baremetal_benchmarks_kmainline_t{toolsversion}_m{modulesversion}_u{ustversion}'
+      - 'vm_tests_kmainline_l{lttngversion}'
+      - 'vm_tests_fuzzing_kmainline_l{lttngversion}'
+      - 'baremetal_tests_kmainline_l{lttngversion}'
+      - 'baremetal_benchmarks_kmainline_l{lttngversion}'