X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Flttng-baremetal-tests.yaml;h=581b6218361f588d15ce0ed938cf0d89e3add05a;hb=e0fd33ddea67decee67c619e68fc2263d3f52754;hp=7f3ab057719626335e7bc9996af0bb9617e6f5d6;hpb=104ed94bb5a45d6cfa1f9e5ef5591f04888beab8;p=lttng-ci.git

diff --git a/jobs/lttng-baremetal-tests.yaml b/jobs/lttng-baremetal-tests.yaml
index 7f3ab05..581b621 100644
--- a/jobs/lttng-baremetal-tests.yaml
+++ b/jobs/lttng-baremetal-tests.yaml
@@ -16,7 +16,7 @@
           categories:
             - 'baremetal-tests'
     project-type: freestyle
-    node: 'master'
+    node: 'x86-64'
     wrappers:
       - workspace-cleanup
       - timestamps
@@ -24,7 +24,7 @@
       - credentials-binding:
           - text:
               credential-id: jenkins_lava_key
-              variable: LAVA_FRDESO_TOKEN
+              variable: LAVA_JENKINS_TOKEN
       - inject:
           properties-content: |
             TOOLS_BRANCH={lttngversion}
@@ -77,10 +77,8 @@
           properties-file: properties.txt
       - shell: !include-raw-escape: scripts/lttng-baremetal-tests/run-baremetal-benchmarks.sh
 
-
-
 - defaults:
-    name: kvm_tests
+    name: vm_tests
     description: |
       Runs baremetal kernel tests over different combination of kernel and lttng configurations.
     project-type: freestyle
@@ -104,7 +102,7 @@
       - credentials-binding:
           - text:
               credential-id: jenkins_lava_key
-              variable: LAVA_FRDESO_TOKEN
+              variable: LAVA_JENKINS_TOKEN
       - inject:
           properties-content: |
             BUILD_DEVICE=kvm
@@ -139,6 +137,11 @@
     publishers:
       - email:
           recipients: 'francis.deslauriers@efficios.com'
+      - ircbot:
+          strategy: new-failure-and-fixed
+          channels:
+            - name: '#lttng'
+
     builders:
       - shell: !include-raw-escape: scripts/lttng-baremetal-tests/generate-properties-master.sh
       - trigger-builds:
@@ -174,7 +177,7 @@
       - credentials-binding:
           - text:
               credential-id: jenkins_lava_key
-              variable: LAVA_FRDESO_TOKEN
+              variable: LAVA_JENKINS_TOKEN
       - inject:
           properties-content: |
             UST_BRANCH={lttngversion}
@@ -208,6 +211,10 @@
     publishers:
       - email:
           recipients: 'francis.deslauriers@efficios.com'
+      - ircbot:
+          strategy: new-failure-and-fixed
+          channels:
+            - name: '#lttng'
     builders:
       - shell: !include-raw-escape: scripts/lttng-baremetal-tests/generate-properties-master.sh
       - trigger-builds:
@@ -222,8 +229,8 @@
     name: baremetal_benchmarks_k{kversion}_l{lttngversion}
     defaults: baremetal_benchmarks
 - job-template:
-    name: kvm_tests_k{kversion}_l{lttngversion}
-    defaults: kvm_tests
+    name: vm_tests_k{kversion}_l{lttngversion}
+    defaults: vm_tests
 - job-template:
     name: baremetal_tests_k{kversion}_l{lttngversion}
     defaults: baremetal_tests
@@ -232,15 +239,15 @@
     name: baremetal_tests_k{kversion}_l{lttngversion}_canary
     defaults: baremetal_tests
 - job-template:
-    name: kvm_tests_k{kversion}_l{lttngversion}_canary
-    defaults: kvm_tests
+    name: vm_tests_k{kversion}_l{lttngversion}_canary
+    defaults: vm_tests
 - job-template:
     name: baremetal_benchmarks_k{kversion}_l{lttngversion}_canary
     defaults: baremetal_benchmarks
 
 - job-template:
-    name: kvm_tests_kmainline_l{lttngversion}
-    defaults: kvm_tests
+    name: vm_tests_kmainline_l{lttngversion}
+    defaults: vm_tests
     triggers:
       - pollscm:
           cron: "@daily"
@@ -299,26 +306,7 @@
             - "master"
           fastpoll: true
           basedir: src/linux
-    wrappers:
-      - workspace-cleanup
-      - timestamps
-      - ansicolor
-      - credentials-binding:
-          - text:
-              credential-id: jenkins_lava_key
-              variable: LAVA_FRDESO_TOKEN
-      - inject:
-          properties-content: |
-            BUILD_DEVICE=baremetal
-    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-file: properties.txt
-      - shell: !include-raw-escape: scripts/lttng-baremetal-tests/run-baremetal-benchmarks.sh
+
 - job-template:
     name: baremetal_benchmarks_kmainline_l{lttngversion}
     defaults: baremetal_benchmarks
@@ -349,26 +337,6 @@
             - "master"
           fastpoll: true
           basedir: src/linux
-    wrappers:
-      - workspace-cleanup
-      - timestamps
-      - ansicolor
-      - credentials-binding:
-          - text:
-              credential-id: jenkins_lava_key
-              variable: LAVA_FRDESO_TOKEN
-      - inject:
-          properties-content: |
-            BUILD_DEVICE=baremetal
-    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-file: properties.txt
-      - shell: !include-raw-escape: scripts/lttng-baremetal-tests/run-baremetal-benchmarks.sh
 
 - job:
     name: build_kernel_PARAM
@@ -378,7 +346,7 @@
     concurrent: true
 
     logrotate:
-      numToKeep: 20
+      numToKeep: 50
     node: 'x86-64'
 
     wrappers:
@@ -449,7 +417,7 @@
       - stable-2.8
       - stable-2.9
     jobs:
-      - 'kvm_tests_k{kversion}_l{lttngversion}'
+      - 'vm_tests_k{kversion}_l{lttngversion}'
       - 'baremetal_benchmarks_k{kversion}_l{lttngversion}'
       - 'baremetal_tests_k{kversion}_l{lttngversion}'
 
@@ -461,7 +429,7 @@
     lttngversion:
       - stable-2.7
     jobs:
-      - 'kvm_tests_k{kversion}_l{lttngversion}':
+      - 'vm_tests_k{kversion}_l{lttngversion}':
       - 'baremetal_tests_k{kversion}_l{lttngversion}':
       - 'baremetal_benchmarks_k{kversion}_l{lttngversion}':
 
@@ -472,7 +440,7 @@
     lttngversion:
       - v2.8.1
     jobs:
-      - 'kvm_tests_k{kversion}_l{lttngversion}_canary'
+      - 'vm_tests_k{kversion}_l{lttngversion}_canary'
       - 'baremetal_tests_k{kversion}_l{lttngversion}_canary'
       - 'baremetal_benchmarks_k{kversion}_l{lttngversion}_canary'
 
@@ -481,6 +449,6 @@
     lttngversion:
       - v2.8.1
     jobs:
-      - 'kvm_tests_kmainline_l{lttngversion}'
+      - 'vm_tests_kmainline_l{lttngversion}'
       - 'baremetal_tests_kmainline_l{lttngversion}'
       - 'baremetal_benchmarks_kmainline_l{lttngversion}'