X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fsystem-tests%2Fsystem-trigger.groovy;h=0fedc26fe095347b242383d92044217e7edc3745;hb=c17a93f36a65302f16afbd61ed0043c5a108a574;hp=823bdbec8ed140c82add9a13abbcbb0d704943b8;hpb=920a3cfdbaf1a38a38020328d98af84d8f1cd2d6;p=lttng-ci.git diff --git a/scripts/system-tests/system-trigger.groovy b/scripts/system-tests/system-trigger.groovy index 823bdbe..0fedc26 100644 --- a/scripts/system-tests/system-trigger.groovy +++ b/scripts/system-tests/system-trigger.groovy @@ -382,16 +382,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 +407,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];