X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-baremetal-tests.yaml;h=bef4fa1ffb7ba9c5fc35b7ea3690b35553e19ee7;hb=e3f027ec4776a46dba6e961111e00b3327bb6387;hp=415ee335ebd5d64f4ac89be2e6406064943f33a8;hpb=cfceede27f7a7f5f6720ee9cf0ab641d85db0c5a;p=lttng-ci.git

diff --git a/jobs/lttng-baremetal-tests.yaml b/jobs/lttng-baremetal-tests.yaml
index 415ee33..bef4fa1 100644
--- a/jobs/lttng-baremetal-tests.yaml
+++ b/jobs/lttng-baremetal-tests.yaml
@@ -26,7 +26,7 @@
               credential-id: jenkins_lava_key
               variable: LAVA_JENKINS_TOKEN
           - file:
-              credential-id: lava_jenkins_storage_frdeso
+              credential-id: system_tests_storage_key
               variable: identity_file
       - inject:
           properties-content: |
@@ -73,6 +73,7 @@
 
     builders:
       - shell: !include-raw-escape: scripts/lttng-baremetal-tests/generate-properties-master.sh
+      - shell: !include-raw-escape: scripts/lttng-baremetal-tests/inject-ssh-commands.sh
       - trigger-builds:
         - project: "build_kernel_PARAM"
           property-file: 'properties.txt'
@@ -263,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
@@ -280,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"
@@ -294,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
@@ -311,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
@@ -342,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"
@@ -372,7 +417,7 @@
       - ansicolor
       - credentials-binding:
           - file:
-              credential-id: lava_jenkins_storage_frdeso
+              credential-id: system_tests_storage_key
               variable: identity_file
     builders:
       - shell: !include-raw-escape: scripts/lttng-baremetal-tests/generate-properties-slave.sh
@@ -400,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.'
@@ -465,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}'