system-test: add 5.4 to linux versions

[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..86c539f0b25eec11b0d0a7f6cb379231a20feb90 100644 (file)
--- a/scripts/system-tests/system-trigger.groovy
+++ b/scripts/system-tests/system-trigger.groovy
@@ -303,8 +303,7 @@ 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.10']
 def recentLinuxBranchesOfInterest = ['master',
   'linux-5.1.y',
   'linux-5.0.y',
@@ -385,7 +384,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 +407,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];