X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-modules%2Fmaster.groovy;h=a5b19aca1de9bbee832eca932455e44a3d8dfcf5;hb=e468fc14fc62098528f9dd67efa77acf2aff16d8;hp=29ff8ce0078b70daf88f023c9bda38faee0f20b8;hpb=9e5757c625d6f13e7d9e55ad62f1c39bdc1a5ed9;p=lttng-ci.git

diff --git a/scripts/lttng-modules/master.groovy b/scripts/lttng-modules/master.groovy
index 29ff8ce..a5b19ac 100644
--- a/scripts/lttng-modules/master.groovy
+++ b/scripts/lttng-modules/master.groovy
@@ -303,12 +303,13 @@ class UbuntuKVersion implements Comparable<UbuntuKVersion> {
 
 
 // Retrieve parameters of the current build
-def mversion = build.buildVariableResolver.resolve('mversion')
+def mbranch = build.getEnvironment(listener).get('GIT_BRANCH').minus('origin/')
 def maxConcurrentBuild = build.buildVariableResolver.resolve('maxConcurrentBuild')
 def kgitrepo = build.buildVariableResolver.resolve('kgitrepo')
 def kverfloor_raw = build.buildVariableResolver.resolve('kverfloor')
 def kverceil_raw = build.buildVariableResolver.resolve('kverceil')
 def kverfilter = build.buildVariableResolver.resolve('kverfilter')
+def kverrc = build.buildVariableResolver.resolve('kverrc')
 def uversion = build.buildVariableResolver.resolve('uversion')
 def job = Hudson.instance.getJob(build.buildVariableResolver.resolve('kbuildjob'))
 def currentJobName = build.project.getFullDisplayName()
@@ -347,17 +348,14 @@ if (uversion != null) {
     case 'bionic':
       matchStrs = [
         ~/^refs\/tags\/(Ubuntu-4\.15\.0-\d{1,3}?\.[\d]+)$/,
-        ~/^refs\/tags\/(Ubuntu-hwe-4\.18\.0-.*_18\.04\.\d+)$/,
         ~/^refs\/tags\/(Ubuntu-hwe-5\.0\.0-.*_18\.04\.\d+)$/,
+        ~/^refs\/tags\/(Ubuntu-hwe-5\.3\.0-.*_18\.04\.\d+)$/,
       ]
       break
 
     case 'xenial':
       matchStrs = [
         ~/^refs\/tags\/(Ubuntu-4\.4\.0-\d{1,3}?\.[\d]+)$/,
-        ~/^refs\/tags\/(Ubuntu-hwe-4\.8\.0-.*_16\.04\.\d+)$/,
-        ~/^refs\/tags\/(Ubuntu-hwe-4\.10\.0-.*_16\.04\.\d+)$/,
-        ~/^refs\/tags\/(Ubuntu-hwe-4\.13\.0-.*_16\.04\.\d+)$/,
         ~/^refs\/tags\/(Ubuntu-hwe-4\.15\.0-.*_16\.04\.\d+)$/,
       ]
 
@@ -449,9 +447,11 @@ switch (kverfilter) {
     break
 }
 
-// If the last RC version is newer than the last stable, add it to the build list
-if (kversionsRC.size() > 0 && kversionsRC.last() > kversions.last()) {
-  kversions.add(kversionsRC.last())
+if (kverrc == "true") {
+  // If the last RC version is newer than the last stable, add it to the build list
+  if (kversionsRC.size() > 0 && kversionsRC.last() > kversions.last()) {
+    kversions.add(kversionsRC.last())
+  }
 }
 
 println "Building the following kernel versions:"
@@ -476,7 +476,7 @@ while ( kversions.size() != 0 || ongoingBuild.size() != 0 ) {
   if(ongoingBuild.size() < maxConcurrentBuild.toInteger() && kversions.size() != 0) {
     def kversion = kversions.pop()
     def job_params = [
-      new StringParameterValue('mversion', mversion),
+      new StringParameterValue('mversion', mbranch),
       new StringParameterValue('mgitrepo', mgitrepo),
       new StringParameterValue('ktag', kversion.toString()),
       new StringParameterValue('kgitrepo', kgitrepo),
@@ -484,7 +484,7 @@ while ( kversions.size() != 0 || ongoingBuild.size() != 0 ) {
 
     // Launch the parametrized build
     def param_build = job.scheduleBuild2(0, new Cause.UpstreamCause(build), new ParametersAction(job_params))
-    println "triggering ${joburl} for the ${mversion} branch on kernel ${kversion}"
+    println "triggering ${joburl} for the ${mbranch} branch on kernel ${kversion}"
 
     // Add it to the ongoing build queue
     ongoingBuild.push(param_build)