X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fsystem-tests%2Fsystem-trigger.groovy;h=86c539f0b25eec11b0d0a7f6cb379231a20feb90;hb=a65d328582e839e524868f2f2bb642e89b954015;hp=5c843b957164a0d9342479717f1c481d9ade28e7;hpb=11d1fd9c2c82031e2262c4ff07e5e2ea4f8e5115;p=lttng-ci.git

diff --git a/scripts/system-tests/system-trigger.groovy b/scripts/system-tests/system-trigger.groovy
index 5c843b9..86c539f 100644
--- a/scripts/system-tests/system-trigger.groovy
+++ b/scripts/system-tests/system-trigger.groovy
@@ -300,11 +300,22 @@ 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 recentLinuxBranchesOfInterest = ['master', 'linux-4.9.y', 'linux-4.4.y']
-
-def legacyLttngBranchesOfInterest = ['stable-2.7']
-def legacyLinuxBranchesOfInterest = ['linux-3.18.y']
+def recentLttngBranchesOfInterest = ['master',
+  'stable-2.12',
+  'stable-2.11',
+  'stable-2.10']
+def recentLinuxBranchesOfInterest = ['master',
+  'linux-5.1.y',
+  'linux-5.0.y',
+  'linux-4.19.y',
+  'linux-4.14.y',
+  'linux-4.9.y',
+  'linux-4.4.y']
+
+def legacyLttngBranchesOfInterest = []
+def legacyLinuxBranchesOfInterest = []
+
+def vmLinuxBranchesOfInterest = ['linux-3.18.y']
 
 // Generate configurations of interest.
 def configurationOfInterest = [] as Set
@@ -322,7 +333,7 @@ legacyLttngBranchesOfInterest.each { lttngBranch ->
 }
 
 def lttngBranchesOfInterest = recentLttngBranchesOfInterest + legacyLttngBranchesOfInterest
-def linuxBranchesOfInterest = recentLinuxBranchesOfInterest + legacyLinuxBranchesOfInterest
+def linuxBranchesOfInterest = recentLinuxBranchesOfInterest + legacyLinuxBranchesOfInterest + vmLinuxBranchesOfInterest
 
 // For LTTng branches, we look for new commits.
 def toolsHeadCommits = GetHeadCommits(toolsRepo, lttngBranchesOfInterest)
@@ -350,6 +361,11 @@ def CraftConfig = { linuxBr, lttngBr ->
 triggerJobName = build.project.getFullDisplayName();
 if (triggerJobName.contains("vm_tests")) {
   jobType = 'vm_tests';
+  recentLttngBranchesOfInterest.each { lttngBranch ->
+    vmLinuxBranchesOfInterest.each { linuxBranch ->
+      configurationOfInterest.add([lttngBranch, linuxBranch])
+    }
+  }
 } else if (triggerJobName.contains("baremetal_tests")) {
   jobType = 'baremetal_tests';
 } else if (triggerJobName.contains("baremetal_benchmarks")) {
@@ -365,24 +381,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;
 
@@ -396,9 +406,9 @@ 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];
 
     // If the code has not changed report previous status.
@@ -406,7 +416,8 @@ currentJobs.each { jobName, jobInfo ->
       // if the config has not changed, we keep it.
       // if it's failed, we don't launch a new job and keep it failed.
       jobInfo['status'] = pastJob['status'];
-      if (pastJob['status'] == 'FAILED') {
+      if (pastJob['status'] == 'FAILED' &&
+            build.getBuildVariables().get('FORCE_FAILED_JOB_RUN') == 'false') {
         println("${jobName} as not changed since the last failed run. Don't run it again.");
         // Marked the umbrella job for failure but still run the jobs that since the
         // last run.