Merge "ansible: Use 'compilers_legacy_install' to control legacy CC installation"

[lttng-ci.git] / scripts / lttng-modules / master-rt.groovy

diff --git a/scripts/lttng-modules/master-rt.groovy b/scripts/lttng-modules/master-rt.groovy
index 5f634ed5a9e9fa4875b4103bce1f3816c427db06..dd24317940a5d18ab45ad74e9aad7646a533f9ee 100644 (file)
--- a/scripts/lttng-modules/master-rt.groovy
+++ b/scripts/lttng-modules/master-rt.groovy
@@ -158,7 +158,7 @@ class RTKVersion implements Comparable<RTKVersion> {
 
 
 // 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')
@@ -197,6 +197,7 @@ def blacklist = [
   ~/v4\.11\.12-rt11-rebase/,
   ~/v4\.11\.12-rt12-rebase/,
   ~/v4\.11\.12-rt13-rebase/,
+  ~/v4\.19.*-rebase/,
   ~/v3\.6.*-rebase/,
   ~/v3\.8.*-rebase/,
 ]
@@ -302,7 +303,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),
@@ -310,7 +311,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)