X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fsystem-tests%2Fsystem-trigger.groovy;h=c12cfe03004acbda68b56ae525a1ee2168d9cd3a;hb=b66a41c261aa9b38510fdeb38fe3ab42c2288bd2;hp=9736b02376dc4727dc3722ef84a07aa40a1e2b43;hpb=7aab161e06d67b7c331648e2526723839b247928;p=lttng-ci.git

diff --git a/scripts/system-tests/system-trigger.groovy b/scripts/system-tests/system-trigger.groovy
index 9736b02..c12cfe0 100644
--- a/scripts/system-tests/system-trigger.groovy
+++ b/scripts/system-tests/system-trigger.groovy
@@ -301,10 +301,18 @@ 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 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 = ['stable-2.7']
-def legacyLinuxBranchesOfInterest = ['linux-3.18.y']
+def legacyLttngBranchesOfInterest = []
+def legacyLinuxBranchesOfInterest = []
+
+def vmLinuxBranchesOfInterest = ['linux-3.18.y']
 
 // Generate configurations of interest.
 def configurationOfInterest = [] as Set
@@ -322,7 +330,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 +358,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")) {
@@ -367,22 +380,22 @@ configurationOfInterest.each { lttngBr, linuxBr  ->
   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);
-  }
+  //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";
 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;
 
@@ -407,7 +420,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.