X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=scripts%2Fsystem-tests%2Fsystem-trigger.groovy;h=21513646ef1c8dd91e787ff6aa7268fef2f37e6a;hb=afd608b2300c98996323e1801fdc3578aecc0430;hp=62414898d643a2c2ec71addf915116d3108c0a93;hpb=2537aa57563d59942b0b70f0cbd518eeb5a9abd7;p=lttng-ci.git

diff --git a/scripts/system-tests/system-trigger.groovy b/scripts/system-tests/system-trigger.groovy
index 6241489..2151364 100644
--- a/scripts/system-tests/system-trigger.groovy
+++ b/scripts/system-tests/system-trigger.groovy
@@ -300,8 +300,11 @@ final String linuxRepo = "git://git.kernel.org/pub/scm/linux/kernel/git/stable/l
 
 final String pastJobsPath = build.getEnvironment(listener).get('WORKSPACE') + "/pastjobs";
 
-def recentLttngBranchesOfInterest = ['master', 'stable-2.10', 'stable-2.9']
+def recentLttngBranchesOfInterest = ['master',
+  'stable-2.12',
+  'stable-2.11']
 def recentLinuxBranchesOfInterest = ['master',
+  'linux-5.4.y',
   'linux-5.1.y',
   'linux-5.0.y',
   'linux-4.19.y',
@@ -365,8 +368,6 @@ if (triggerJobName.contains("vm_tests")) {
   }
 } else if (triggerJobName.contains("baremetal_tests")) {
   jobType = 'baremetal_tests';
-} else if (triggerJobName.contains("baremetal_benchmarks")) {
-  jobType = 'baremetal_benchmarks';
 }
 
 // Hashmap containing all the jobs, their configuration (commit id, etc. )and
@@ -378,24 +379,18 @@ def currentJobs = [:];
 configurationOfInterest.each { lttngBr, linuxBr  ->
   def jobName = CraftJobName(jobType, linuxBr, lttngBr);
   currentJobs[jobName] = CraftConfig(linuxBr, lttngBr);
-
-  // Add fuzzing job in vm_tests on master branches of lttng and linux.
-  //if (jobType == 'vm_tests' && lttngBr == 'master' && linuxBr == 'master') {
-  //  def vmFuzzingJobName = CraftJobName(jobType + '_fuzzing', linuxBr, lttngBr);
-  //  currentJobs[vmFuzzingJobName] = CraftConfig(linuxBr, lttngBr);
-  //}
 }
 
 //Add canary job
-def jobNameCanary = jobType + "_canary";
+def jobNameCanary = jobType + "_kcanary_lcanary";
 currentJobs[jobNameCanary] = [:];
 currentJobs[jobNameCanary]['config'] = [:];
-currentJobs[jobNameCanary]['config']['linuxBranch'] = 'v4.4.9';
-currentJobs[jobNameCanary]['config']['lttngBranch'] = 'v2.8.6';
-currentJobs[jobNameCanary]['config']['linuxTagID'] ='1a1a512b983108015ced1e7a7c7775cfeec42d8c';
-currentJobs[jobNameCanary]['config']['toolsCommit'] = '9f10e482d6cc937acead52951cf69c553cd11e22'
-currentJobs[jobNameCanary]['config']['modulesCommit'] = '7fd9215'
-currentJobs[jobNameCanary]['config']['ustCommit'] = '514a87f'
+currentJobs[jobNameCanary]['config']['linuxBranch'] = 'v4.4.194';
+currentJobs[jobNameCanary]['config']['lttngBranch'] = 'v2.10.7';
+currentJobs[jobNameCanary]['config']['linuxTagID'] ='a227f8436f2b21146fc024d84e6875907475ace2';
+currentJobs[jobNameCanary]['config']['toolsCommit'] = '93fa2c9ff6b52c30173bee80445501ce8677fecc'
+currentJobs[jobNameCanary]['config']['modulesCommit'] = 'fe3ca7a9045221ffbedeac40ba7e09b1fc500e21'
+currentJobs[jobNameCanary]['config']['ustCommit'] = '0172ce8ece2102d46c7785e6bd96163225c59e49'
 currentJobs[jobNameCanary]['status'] = 'NOT_SET';
 currentJobs[jobNameCanary]['build'] = null;
 
@@ -409,9 +404,8 @@ def ongoingJobs = 0;
 
 currentJobs.each { jobName, jobInfo ->
   // If the job ran in the past, we check if the IDs changed since.
-  // Fetch past results only if the job is not of type canary or fuzzing.
-  if (!jobName.contains('_canary') && !jobName.contains('_fuzzing') &&
-         pastJobs.containsKey(jobName) &&
+  // Fetch past results only if the job is not of type canary.
+  if (!jobName.contains('_kcanary_lcanary') && pastJobs.containsKey(jobName) &&
          build.getBuildVariables().get('FORCE_JOB_RUN') == 'false') {
     pastJob = pastJobs[jobName];