X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=scripts%2Flttng-modules%2Fmaster.groovy;h=5989673b1b06170b933001727df529eaaa3a7f31;hb=94ff4298157011a4e382f76791d66aa15466806c;hp=a5b19aca1de9bbee832eca932455e44a3d8dfcf5;hpb=73b8af4b2c1c3fd6b1bd8edac0e320ac581d9760;p=lttng-ci.git diff --git a/scripts/lttng-modules/master.groovy b/scripts/lttng-modules/master.groovy index a5b19ac..5989673 100644 --- a/scripts/lttng-modules/master.groovy +++ b/scripts/lttng-modules/master.groovy @@ -1,5 +1,5 @@ /** - * Copyright (C) 2016-2018 - Michael Jeanson + * Copyright (C) 2016-2020 Michael Jeanson * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -205,9 +205,10 @@ class UbuntuKVersion implements Comparable { throw new EmptyKVersionException("Empty kernel version") } + //'Ubuntu-hwe-5.8-5.8.0-19.20_20.04.3', //'Ubuntu-lts-4.8.0-27.29_16.04.1', //'Ubuntu-4.4.0-70.91', - def match = version =~ /^Ubuntu-(lts-|hwe-)??(\d+)\.(\d+)\.(\d+)-(\d+)\.(\d+)(.*)??$/ + def match = version =~ /^Ubuntu-(lts-|hwe-)??(?:\d+\.\d+-)??(\d+)\.(\d+)\.(\d+)-(\d+)\.(\d+)(.*)??$/ if (!match) { throw new InvalidKVersionException("Invalid kernel version: ${version}") } @@ -295,7 +296,12 @@ class UbuntuKVersion implements Comparable { vString = vString.concat("${this.strLTS}") } - vString = vString.concat("${this.major}.${this.minor}.${this.patch}-${this.umajor}.${this.uminor}${this.suffix}") + // The tag pattern changed for HWE kernels >= 5.0 + if (this.isLTS && this.major >= 5) { + vString = vString.concat("${this.major}.${this.minor}-${this.major}.${this.minor}.${this.patch}-${this.umajor}.${this.uminor}${this.suffix}") + } else { + vString = vString.concat("${this.major}.${this.minor}.${this.patch}-${this.umajor}.${this.uminor}${this.suffix}") + } return vString } @@ -339,35 +345,25 @@ def kversionFactory = "" if (uversion != null) { kversionFactory = new UbuntuKVersion() switch (uversion) { - case 'focal': + case 'jammy': matchStrs = [ - ~/^refs\/tags\/(Ubuntu-5\.4\.0-\d{1,3}?\.[\d]+)$/, + ~/^refs\/tags\/(Ubuntu-5\.15\.0-\d{1,3}?\.[\d]+)$/, + ~/^refs\/tags\/(Ubuntu-hwe-6\.2-6\.2\.0-.*_22\.04\.\d+)$/, + ~/^refs\/tags\/(Ubuntu-hwe-6\.5-6\.5\.0-.*_22\.04\.\d+)$/, ] break - case 'bionic': - matchStrs = [ - ~/^refs\/tags\/(Ubuntu-4\.15\.0-\d{1,3}?\.[\d]+)$/, - ~/^refs\/tags\/(Ubuntu-hwe-5\.0\.0-.*_18\.04\.\d+)$/, - ~/^refs\/tags\/(Ubuntu-hwe-5\.3\.0-.*_18\.04\.\d+)$/, - ] - break - - case 'xenial': + case 'focal': matchStrs = [ - ~/^refs\/tags\/(Ubuntu-4\.4\.0-\d{1,3}?\.[\d]+)$/, - ~/^refs\/tags\/(Ubuntu-hwe-4\.15\.0-.*_16\.04\.\d+)$/, - ] - - blacklist = [ - 'Ubuntu-lts-4.10.0-7.9_16.04.1', + ~/^refs\/tags\/(Ubuntu-5\.4\.0-\d{1,3}?\.[\d]+)$/, + ~/^refs\/tags\/(Ubuntu-hwe-5\.13-5\.13\.0-.*_20\.04\.\d+)$/, + ~/^refs\/tags\/(Ubuntu-hwe-5\.15-5\.15\.0-.*_20\.04\.\d+)$/, ] break - case 'trusty': + case 'noble': matchStrs = [ - ~/^refs\/tags\/(Ubuntu-3\.13\.0-[\d\.]+)$/, - ~/^refs\/tags\/(Ubuntu-lts-.*_14\.04\.\d+)$/, + ~/^refs\/tags\/(Ubuntu-6\.8\.0-\d{1,3}?\.[\d]+)$/, ] break @@ -420,6 +416,7 @@ for (ref in refs) { } } +// The filtering step assumes the version lists are sorted kversions.sort() kversionsRC.sort() @@ -441,6 +438,70 @@ switch (kverfilter) { } break + case 'lts-head': + // Keep only the head of each LTS branch and the latest non-RC tag + println('Filter kernel versions to keep only the latest point release of each lts branch and the current stable.') + + def lts_kversions = [] + // Old LTS entries are kept so that "lts-head" is still meaningful in kernel + // version ranges that are supported by lttng-modules but no longer supported + // upstream, eg. lttng-modules stable-2.13 supports >= 3.0 + lts_kversions.add(kversionFactory.factory("v3.0")) // LTS until October 2013 + lts_kversions.add(kversionFactory.factory("v3.2")) // LTS until May 2018 + lts_kversions.add(kversionFactory.factory("v3.4")) // LTS until October 2016 + lts_kversions.add(kversionFactory.factory("v3.10")) // LTS until November 2017 + lts_kversions.add(kversionFactory.factory("v3.12")) // LTS until May 2017 + lts_kversions.add(kversionFactory.factory("v3.14")) // LTS until August 2016 + lts_kversions.add(kversionFactory.factory("v3.16")) // LTS until October 2014 + lts_kversions.add(kversionFactory.factory("v3.18")) // LTS until January 2017 + lts_kversions.add(kversionFactory.factory("v4.1")) // LTS until May 2018 + lts_kversions.add(kversionFactory.factory("v4.4")) // SLTS until 2026 + lts_kversions.add(kversionFactory.factory("v4.9")) // LTS until January 2023 + lts_kversions.add(kversionFactory.factory("v4.14")) // LTS until January 2024 + lts_kversions.add(kversionFactory.factory("v4.19")) // LTS until December 2024 + lts_kversions.add(kversionFactory.factory("v5.4")) // LTS until December 2025 + lts_kversions.add(kversionFactory.factory("v5.10")) // LTS until December 2026 + lts_kversions.add(kversionFactory.factory("v5.15")) // LTS until December 2026 + lts_kversions.add(kversionFactory.factory("v6.1")) // LTS until December 2026 + lts_kversions.add(kversionFactory.factory("v6.6")) // LTS until December 2026 + + // First filter the head of each branch + for (i = 0; i < kversions.size(); i++) { + def curr = kversions[i] + def next = i < kversions.size() - 1 ? kversions[i + 1] : null + + if (next != null) { + if (curr.isSameStable(next)) { + kversions.remove(i) + i-- + } + } + } + + for (i = 0; i < kversions.size(); i++) { + def curr = kversions[i] + + // Keep the newest tag + if (i == kversions.size() - 1) { + break + } + + // Prune non-LTS versions + def keep = false + for (j = 0; j < lts_kversions.size(); j++) { + if (curr.isSameStable(lts_kversions[j])) { + keep = true + break + } + } + + if (!keep) { + kversions.remove(i) + i-- + } + } + break + default: // No filtering of kernel versions println('No kernel versions filtering selected.') @@ -504,10 +565,13 @@ while ( kversions.size() != 0 || ongoingBuild.size() != 0 ) { } // Abort job if a newer instance is queued - similarJobQueued = Hudson.instance.queue.items.count{it.task.getFullDisplayName() == currentJobName} - if ( similarJobQueued > 0 ) { + if (!currentJobName.contains("gerrit")) { + similarJobQueued = Hudson.instance.queue.items.count{it.task.getFullDisplayName() == currentJobName} + if (similarJobQueued > 0) { + println "Abort, a newer instance of the job was queued" build.setResult(hudson.model.Result.ABORTED) throw new InterruptedException() + } } def i = ongoingBuild.iterator()