X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-baremetal-tests.yaml;h=bef4fa1ffb7ba9c5fc35b7ea3690b35553e19ee7;hb=61afb3c349be6d2ed9c4280cd9fbbadd7d88d3fa;hp=c0312792fda46f5115b1a94580937848c033df08;hpb=e8de44ed67015d2eede5c371157c52aa49d8ebf1;p=lttng-ci.git

diff --git a/jobs/lttng-baremetal-tests.yaml b/jobs/lttng-baremetal-tests.yaml
index c031279..bef4fa1 100644
--- a/jobs/lttng-baremetal-tests.yaml
+++ b/jobs/lttng-baremetal-tests.yaml
@@ -264,16 +264,30 @@
       - timed: "@daily"
 
 - job-template:
-    name: vm_tests_kmainline_l{lttngversion}
+    name: vm_tests_kmainline_t{toolsversion}_m{modulesversion}_u{ustversion}
     defaults: vm_tests
     triggers:
       - pollscm:
           cron: "@daily"
+    wrappers:
+      - workspace-cleanup
+      - timestamps
+      - ansicolor
+      - credentials-binding:
+          - text:
+              credential-id: jenkins_lava_key
+              variable: LAVA_JENKINS_TOKEN
+      - 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:
-            - "{lttngversion}"
+            - "{toolsversion}"
           shallow-clone: true
           skip-tag: true
           fastpoll: true
@@ -281,13 +295,13 @@
       - git:
           url: git://git-mirror.internal.efficios.com/lttng/lttng-modules.git
           branches:
-            - "{lttngversion}"
+            - "{modulesversion}"
           shallow-clone: true
           skip-tag: true
           fastpoll: true
           basedir: src/lttng-modules
       - git:
-          url: git://git-mirror.internal.efficios.com/kernel/stable/linux-stable.git
+          url: git://git-mirror.internal.efficios.com/kernel/torvalds/linux.git
           refspec: "+refs/tags/*:refs/remotes/origin/tags/*"
           branches:
             - "master"
@@ -295,16 +309,30 @@
           basedir: src/linux
 
 - job-template:
-    name: baremetal_tests_kmainline_l{lttngversion}
+    name: baremetal_tests_kmainline_t{toolsversion}_m{modulesversion}_u{ustversion}
     defaults: baremetal_tests
     triggers:
       - pollscm:
           cron: "@daily"
+    wrappers:
+      - workspace-cleanup
+      - timestamps
+      - ansicolor
+      - credentials-binding:
+          - text:
+              credential-id: jenkins_lava_key
+              variable: LAVA_JENKINS_TOKEN
+      - 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:
-            - "{lttngversion}"
+            - "{toolsversion}"
           shallow-clone: true
           skip-tag: true
           fastpoll: true
@@ -312,30 +340,46 @@
       - git:
           url: git://git-mirror.internal.efficios.com/lttng/lttng-modules.git
           branches:
-            - "{lttngversion}"
+            - "{modulesversion}"
           shallow-clone: true
           skip-tag: true
           fastpoll: true
           basedir: src/lttng-modules
       - git:
-          url: git://git-mirror.internal.efficios.com/kernel/stable/linux-stable.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
-
 - job-template:
-    name: baremetal_benchmarks_kmainline_l{lttngversion}
+    name: baremetal_benchmarks_kmainline_t{toolsversion}_m{modulesversion}_u{ustversion}
     defaults: baremetal_benchmarks
     triggers:
       - pollscm:
           cron: "@daily"
+    wrappers:
+      - workspace-cleanup
+      - timestamps
+      - ansicolor
+      - credentials-binding:
+          - text:
+              credential-id: jenkins_lava_key
+              variable: LAVA_JENKINS_TOKEN
+          - file:
+              credential-id: system_tests_storage_key
+              variable: identity_file
+      - 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:
-            - "{lttngversion}"
+            - "{toolsversion}"
           shallow-clone: true
           skip-tag: true
           fastpoll: true
@@ -343,13 +387,13 @@
       - git:
           url: git://git-mirror.internal.efficios.com/lttng/lttng-modules.git
           branches:
-            - "{lttngversion}"
+            - "{modulesversion}"
           shallow-clone: true
           skip-tag: true
           fastpoll: true
           basedir: src/lttng-modules
       - git:
-          url: git://git-mirror.internal.efficios.com/kernel/stable/linux-stable.git
+          url: git://git-mirror.internal.efficios.com/kernel/torvalds/linux.git
           refspec: "+refs/tags/*:refs/remotes/origin/tags/*"
           branches:
             - "master"
@@ -401,6 +445,10 @@
       - 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.'
@@ -466,9 +514,13 @@
 
 - project:
     name: lttng-kernel-tests-mainline
-    lttngversion:
-      - v2.8.1
+    toolsversion:
+      - v2.9.3
+    ustversion:
+      - v2.9.0
+    modulesversion:
+      - stable-2.9
     jobs:
-      - 'vm_tests_kmainline_l{lttngversion}'
-      - 'baremetal_tests_kmainline_l{lttngversion}'
-      - 'baremetal_benchmarks_kmainline_l{lttngversion}'
+      - '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}'