X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fsystem-tests%2Fsystem-trigger.groovy;h=6b1028d2a4cd07b1189c04a73f16ed252e5fbc31;hb=eedda9798a7ef2d43fda1ebf5fd238f2b52532b1;hp=0fedc26fe095347b242383d92044217e7edc3745;hpb=c17a93f36a65302f16afbd61ed0043c5a108a574;p=lttng-ci.git

diff --git a/scripts/system-tests/system-trigger.groovy b/scripts/system-tests/system-trigger.groovy
index 0fedc26..6b1028d 100644
--- a/scripts/system-tests/system-trigger.groovy
+++ b/scripts/system-tests/system-trigger.groovy
@@ -269,11 +269,15 @@ def CraftJobName = { jobType, linuxBranch, lttngBranch ->
 
 def LaunchJob = { jobName, jobInfo ->
   def job = Hudson.instance.getJob(jobName)
+  if (job == null) {
+    println(String.format("Failed to find job by name '%s'", jobName))
+    return null;
+  }
   def params = []
   for (paramdef in job.getProperty(ParametersDefinitionProperty.class).getParameterDefinitions()) {
     // If there is a default value for this parameter, use it. Don't use empty
     // default value parameters.
-    if (paramdef.getDefaultValue()) {
+    if (paramdef.getDefaultParameterValue() != null) {
       params += paramdef.getDefaultParameterValue();
     }
   }
@@ -301,22 +305,26 @@ 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.12',
-  'stable-2.11',
-  'stable-2.10',
-  'stable-2.9']
+  'stable-2.13',
+  'stable-2.12']
 def recentLinuxBranchesOfInterest = ['master',
-  'linux-5.1.y',
-  'linux-5.0.y',
+  'linux-6.1.y',
+  'linux-5.15.y',
+  'linux-5.10.y',
+  'linux-5.4.y',
   'linux-4.19.y',
   'linux-4.14.y',
-  'linux-4.9.y',
-  'linux-4.4.y']
+]
 
 def legacyLttngBranchesOfInterest = []
-def legacyLinuxBranchesOfInterest = []
+def legacyLinuxBranchesOfInterest = [
+    'linux-5.14.y',
+    'linux-4.18.y',
+    'linux-4.12.y',
+    'linux-4.9.y',
+]
 
-def vmLinuxBranchesOfInterest = ['linux-3.18.y']
+def vmLinuxBranchesOfInterest = []
 
 // Generate configurations of interest.
 def configurationOfInterest = [] as Set
@@ -369,8 +377,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
@@ -388,12 +394,12 @@ configurationOfInterest.each { lttngBr, linuxBr  ->
 def jobNameCanary = jobType + "_kcanary_lcanary";
 currentJobs[jobNameCanary] = [:];
 currentJobs[jobNameCanary]['config'] = [:];
-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]['config']['linuxBranch'] = 'v5.15.112';
+currentJobs[jobNameCanary]['config']['lttngBranch'] = 'v2.13.9';
+currentJobs[jobNameCanary]['config']['linuxTagID'] ='9d6bde853685609a631871d7c12be94fdf8d912e'; // v5.15.112
+currentJobs[jobNameCanary]['config']['toolsCommit'] = '2ff0385718ff894b3d0e06f3961334c20c5436f8' // v2.13.9
+currentJobs[jobNameCanary]['config']['modulesCommit'] = 'da1f5a264fff33fc5a9518e519fb0084bf1074af' // v2.13.9
+currentJobs[jobNameCanary]['config']['ustCommit'] = 'de624c20694f69702b42c5d47b5bcf692293a238' // v2.13.5
 currentJobs[jobNameCanary]['status'] = 'NOT_SET';
 currentJobs[jobNameCanary]['build'] = null;
 
@@ -435,7 +441,21 @@ currentJobs.each { jobName, jobInfo ->
 
   jobInfo['status'] = 'PENDING';
   jobInfo['build'] = LaunchJob(jobName, jobInfo);
-  ongoingJobs += 1;
+  if (jobInfo['build'] != null) {
+    ongoingJobs += 1;
+  }
+}
+
+// Some jobs may have a null build immediately if LaunchJob
+// failed for some reason, those jobs can immediately be removed.
+def jobKeys = currentJobs.collect { jobName, jobInfo ->
+    return jobName;
+}
+jobKeys.each { k ->
+  if (currentJobs.get(k)['build'] == null) {
+    println(String.format("Removing job '%s' since build is null", k));
+    currentJobs.remove(k);
+  }
 }
 
 while (ongoingJobs > 0) {