jjb: system-tests: remove baremetal benchmarks

[lttng-ci.git] / scripts / system-tests / system-trigger.groovy

diff --git a/scripts/system-tests/system-trigger.groovy b/scripts/system-tests/system-trigger.groovy
index a4e4165b32daf63410bd9ae1f54b11cf1cd564c2..21513646ef1c8dd91e787ff6aa7268fef2f37e6a 100644 (file)
--- a/scripts/system-tests/system-trigger.groovy
+++ b/scripts/system-tests/system-trigger.groovy
@@ -302,10 +302,9 @@ final String pastJobsPath = build.getEnvironment(listener).get('WORKSPACE') + "/
 
 def recentLttngBranchesOfInterest = ['master',
   'stable-2.12',
-  'stable-2.11',
-  'stable-2.10',
-  'stable-2.9']
+  'stable-2.11']
 def recentLinuxBranchesOfInterest = ['master',
+  'linux-5.4.y',
   'linux-5.1.y',
   'linux-5.0.y',
   'linux-4.19.y',
@@ -369,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
@@ -385,7 +382,7 @@ configurationOfInterest.each { lttngBr, linuxBr  ->
 }
 
 //Add canary job
-def jobNameCanary = jobType + "_canary";
+def jobNameCanary = jobType + "_kcanary_lcanary";
 currentJobs[jobNameCanary] = [:];
 currentJobs[jobNameCanary]['config'] = [:];
 currentJobs[jobNameCanary]['config']['linuxBranch'] = 'v4.4.194';
@@ -408,7 +405,7 @@ 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.
-  if (!jobName.contains('_canary') && pastJobs.containsKey(jobName) &&
+  if (!jobName.contains('_kcanary_lcanary') && pastJobs.containsKey(jobName) &&
          build.getBuildVariables().get('FORCE_JOB_RUN') == 'false') {
     pastJob = pastJobs[jobName];