X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-modules%2Fmaster.groovy;h=3e2ec7750b298ddfe41f1cd209c53553ef075307;hb=f4c112e81ad2932eabed71eae64d67db2fa5f7ed;hp=a8bf945f195f7696553915fdf800b12518cdfca9;hpb=c448771aff7ae930b9e4b5f750974d096b79677b;p=lttng-ci.git

diff --git a/scripts/lttng-modules/master.groovy b/scripts/lttng-modules/master.groovy
index a8bf945..3e2ec77 100644
--- a/scripts/lttng-modules/master.groovy
+++ b/scripts/lttng-modules/master.groovy
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2016-2017 - Michael Jeanson <mjeanson@efficios.com>
+ * Copyright (C) 2016-2018 - Michael Jeanson <mjeanson@efficios.com>
  *
  * 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
@@ -171,6 +171,7 @@ class UbuntuKVersion implements Comparable<UbuntuKVersion> {
   Integer umajor = 0
   Integer uminor = 0
   String suffix = ""
+  String strLTS = ""
   Boolean isLTS = false
 
   UbuntuKVersion() {}
@@ -206,12 +207,15 @@ class UbuntuKVersion implements Comparable<UbuntuKVersion> {
 
     //'Ubuntu-lts-4.8.0-27.29_16.04.1',
     //'Ubuntu-4.4.0-70.91',
-    def match = version =~ /^Ubuntu-(lts-)??(\d+)\.(\d+)\.(\d+)-(\d+)\.(\d+)(.*)??$/
+    def match = version =~ /^Ubuntu-(lts-|hwe-)??(\d+)\.(\d+)\.(\d+)-(\d+)\.(\d+)(.*)??$/
     if (!match) {
       throw new InvalidKVersionException("Invalid kernel version: ${version}")
     }
 
-    this.isLTS = match.group(1) != null
+    if (match.group(1) != null) {
+        this.isLTS = true
+        this.strLTS = match.group(1)
+    }
 
     // Major
     this.major = Integer.parseInt(match.group(2))
@@ -288,7 +292,7 @@ class UbuntuKVersion implements Comparable<UbuntuKVersion> {
     String vString = "Ubuntu-"
 
     if (this.isLTS) {
-      vString = vString.concat("lts-")
+      vString = vString.concat("${this.strLTS}")
     }
 
     vString = vString.concat("${this.major}.${this.minor}.${this.patch}-${this.umajor}.${this.uminor}${this.suffix}")
@@ -299,16 +303,17 @@ 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()
-
+def gitmodpath = build.getEnvironment(listener).get('WORKSPACE') + "/src/lttng-modules"
 
 // Get the out variable
 def config = new HashMap()
@@ -317,8 +322,12 @@ config.putAll(bindings.getVariables())
 def out = config['out']
 
 
+// Get the lttng-modules git url
+def gitmodrepo = Git.open(new File(gitmodpath))
+def mgitrepo = gitmodrepo.getRepository().getConfig().getString("remote", "origin", "url")
+
 // Get tags from git repository
-def refs = Git.lsRemoteRepository().setTags(true).setRemote(kgitrepo).call();
+def refs = Git.lsRemoteRepository().setTags(true).setRemote(kgitrepo).call()
 
 // Get kernel versions to build
 def kversions = []
@@ -330,11 +339,24 @@ def kversionFactory = ""
 if (uversion != null) {
   kversionFactory = new UbuntuKVersion()
   switch (uversion) {
+    case 'focal':
+      matchStrs = [
+        ~/^refs\/tags\/(Ubuntu-5\.4\.0-\d{1,3}?\.[\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':
       matchStrs = [
         ~/^refs\/tags\/(Ubuntu-4\.4\.0-\d{1,3}?\.[\d]+)$/,
-        ~/^refs\/tags\/(Ubuntu-lts-4\.8\.0-.*_16\.04\.\d+)$/,
-        ~/^refs\/tags\/(Ubuntu-lts-4\.10\.0-.*_16\.04\.\d+)$/,
+        ~/^refs\/tags\/(Ubuntu-hwe-4\.15\.0-.*_16\.04\.\d+)$/,
       ]
 
       blacklist = [
@@ -350,7 +372,7 @@ if (uversion != null) {
       break
 
     default:
-      println 'Unsupported Ubuntu version: ${uversion}'
+      println "Unsupported Ubuntu version: ${uversion}"
       throw new InterruptedException()
       break
   }
@@ -360,6 +382,9 @@ if (uversion != null) {
   matchStrs = [
     ~/^refs\/tags\/(v[\d\.]+(-rc(\d+))?)$/,
   ]
+  blacklist = [
+    'v3.2.3',
+  ]
 }
 
 // Parse kernel versions
@@ -422,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:"
@@ -449,14 +476,15 @@ 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),
     ]
 
     // 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)
@@ -476,10 +504,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()
@@ -528,7 +559,7 @@ for (b in allBuilds) {
 
 // Mark this build failed if any child build has failed
 if (isFailed) {
-  build.getExecutor().interrupt(Result.FAILURE)
+  build.setResult(hudson.model.Result.FAILURE)
 }
 
 // EOF