final String pastJobsPath = build.getEnvironment(listener).get('WORKSPACE') + "/pastjobs";
-def recentLttngBranchesOfInterest = ['master', 'stable-2.10', 'stable-2.9']
-def recentLinuxBranchesOfInterest = ['master', 'linux-4.19.y', 'linux-4.14.y', 'linux-4.9.y']
-
-def legacyLttngBranchesOfInterest = ['master', 'stable-2.10', 'stable-2.9', 'stable-2.7']
-def legacyLinuxBranchesOfInterest = ['linux-4.4.y']
+def recentLttngBranchesOfInterest = ['master',
+ 'stable-2.12',
+ 'stable-2.11']
+def recentLinuxBranchesOfInterest = ['master',
+ 'linux-5.4.y',
+ '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']
}
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)
}
} 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
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;
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 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.