X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=jobs%2Fsystem-tests.yaml;h=ea6dd475060e2e7339078e7e2f96cf549f7bf5a0;hb=49499ecb0a8345e5cc6ff01556656b0dadfe23f1;hp=44b0376267b3a8217a324b45b7e99043c8d4dd81;hpb=f494aee6be92f602447b00c1fa00b8467d054f5f;p=lttng-ci.git

diff --git a/jobs/system-tests.yaml b/jobs/system-tests.yaml
index 44b0376..ea6dd47 100644
--- a/jobs/system-tests.yaml
+++ b/jobs/system-tests.yaml
@@ -4,35 +4,35 @@
     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'
 
@@ -40,7 +40,7 @@
     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
@@ -95,6 +95,10 @@
       - inject:
           properties-content: |
             BUILD_DEVICE=baremetal
+    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
@@ -113,7 +117,6 @@
           artifacts: '*.png,*.csv'
           stable: true
           do-not-fingerprint: true
-      - system_tests_email_ext_default
       - image-gallery:
         - gallery-type: archived-images-gallery
           title: Results
@@ -125,7 +128,7 @@
     description: |
       Runs virtual machine kernel tests over different combination of kernel and lttng configurations.
     project-type: freestyle
-    node: 'master'
+    node: 'x86-64'
     <<: *system_tests_parameters_defaults
 
     properties:
@@ -149,6 +152,11 @@
           properties-content: |
             BUILD_DEVICE=kvm
 
+    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
       - trigger-builds:
@@ -160,7 +168,6 @@
       - shell: !include-raw-escape: scripts/system-tests/run-kvm-tests.sh
 
     publishers:
-      - system_tests_email_ext_default
       - workspace-cleanup
 
 - defaults:
@@ -168,7 +175,7 @@
     description: |
       Runs virtual machine fuzzing tests over different combination of kernel and lttng configurations.
     project-type: freestyle
-    node: 'master'
+    node: 'x86-64'
     <<: *system_tests_parameters_defaults
 
     properties:
@@ -192,6 +199,11 @@
           properties-content: |
             BUILD_DEVICE=kvm
 
+    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
       - trigger-builds:
@@ -203,7 +215,6 @@
       - shell: !include-raw-escape: scripts/system-tests/run-kvm-fuzzing-tests.sh
 
     publishers:
-      - system_tests_email_ext_default
       - workspace-cleanup
 
 - defaults:
@@ -211,7 +222,7 @@
     description: |
       Runs baremetal kernel tests over different combination of kernel and lttng configurations.
     project-type: freestyle
-    node: 'master'
+    node: 'x86-64'
 
     <<: *system_tests_parameters_defaults
 
@@ -236,6 +247,11 @@
           properties-content: |
             BUILD_DEVICE=baremetal
 
+    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
       - trigger-builds:
@@ -247,7 +263,6 @@
       - shell: !include-raw-escape: scripts/system-tests/run-baremetal-tests.sh
 
     publishers:
-      - system_tests_email_ext_default
       - workspace-cleanup
 
 ## Templates
@@ -301,6 +316,21 @@
               credential-id: system_tests_storage_key
               variable: identity_file
 
+    scm:
+      - git:
+          url: https://github.com/lttng/lttng-ci
+          basedir: src/lttng-ci/
+      - git:
+          url : $KGITREPO
+          basedir: src/linux/
+          branches:
+            - $KERNEL_COMMIT_ID
+      - 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:
@@ -327,7 +357,7 @@
       - 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
@@ -340,7 +370,8 @@
           num-to-keep: 10
 
     triggers:
-      - timed: "@daily"
+      - pollscm:
+          cron: "* * * * 1-5"
 
     wrappers:
       - timestamps
@@ -386,7 +417,6 @@
 ## Project
 - project:
     name: system-tests
-    email_to: 'ci-notification@lists.lttng.org, cc:francis.deslauriers@efficios.com'
     kversion:
       - master
       - linux-4.4.y
@@ -402,10 +432,8 @@
 
 - project:
     name: system-tests-oldkernel
-    email_to: 'ci-notification@lists.lttng.org, cc:francis.deslauriers@efficios.com'
     kversion:
       - linux-3.18.y
-      - linux-4.4.y
     lttngversion:
       - stable-2.7
     jobs:
@@ -415,7 +443,6 @@
 
 - project:
     name: system-tests-canary
-    email_to: 'ci-notification@lists.lttng.org, cc:francis.deslauriers@efficios.com'
     jobs:
       - 'vm_tests_canary'
       - 'baremetal_tests_canary'
@@ -423,14 +450,16 @@
 
 - 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
+      - baremetal_benchmarks
     jobs:
       - 'build_kernel_PARAM'
-      - 'system_ALL_trigger'
+      - 'system_ALL_{test_type}_trigger'