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 823bdbec8ed140c82add9a13abbcbb0d704943b8..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',
@@ -382,16 +381,10 @@ 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.194';
@@ -413,9 +406,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];