X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=inline;f=scripts%2Fsystem-tests%2Fsystem-trigger.groovy;h=3c66edf9d195e13e81de8924961afdb2ba4eeff2;hb=22a5adc992ff324ca3cba81b4fdde5b87762362a;hp=db5b1b571ce6b963431ff68d4b34427954055bf3;hpb=7fa8d866cf930200963aabfa012241ced3046e4a;p=lttng-ci.git

diff --git a/scripts/system-tests/system-trigger.groovy b/scripts/system-tests/system-trigger.groovy
index db5b1b5..3c66edf 100644
--- a/scripts/system-tests/system-trigger.groovy
+++ b/scripts/system-tests/system-trigger.groovy
@@ -367,10 +367,10 @@ 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
@@ -378,9 +378,9 @@ def jobNameCanary = jobType + "_canary";
 currentJobs[jobNameCanary] = [:];
 currentJobs[jobNameCanary]['config'] = [:];
 currentJobs[jobNameCanary]['config']['linuxBranch'] = 'v4.4.9';
-currentJobs[jobNameCanary]['config']['lttngBranch'] = 'v2.8.1';
+currentJobs[jobNameCanary]['config']['lttngBranch'] = 'v2.8.6';
 currentJobs[jobNameCanary]['config']['linuxTagID'] ='1a1a512b983108015ced1e7a7c7775cfeec42d8c';
-currentJobs[jobNameCanary]['config']['toolsCommit'] = 'd11e0db'
+currentJobs[jobNameCanary]['config']['toolsCommit'] = '9f10e482d6cc937acead52951cf69c553cd11e22'
 currentJobs[jobNameCanary]['config']['modulesCommit'] = '7fd9215'
 currentJobs[jobNameCanary]['config']['ustCommit'] = '514a87f'
 currentJobs[jobNameCanary]['status'] = 'NOT_SET';
@@ -396,9 +396,13 @@ def ongoingJobs = 0;
 
 currentJobs.each { jobName, jobInfo ->
   // If the job ran in the past, we check if the IDs changed since.
-  if (pastJobs.containsKey(jobName) && !jobName.contains('_canary')) {
+  // Fetch past results only if the job is not of type canary or fuzzing.
+  if (!jobName.contains('_canary') && !jobName.contains('_fuzzing') &&
+         pastJobs.containsKey(jobName) &&
+         build.getBuildVariables().get('FORCE_JOB_RUN') == 'false') {
     pastJob = pastJobs[jobName];
-    // Have the IDs changed?
+
+    // If the code has not changed report previous status.
     if (pastJob['config'] == jobInfo['config']) {
       // if the config has not changed, we keep it.
       // if it's failed, we don't launch a new job and keep it failed.