From 57bdee9e35d8852b90f3d0fd6fc124c34d8d7c0c Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Wed, 12 Sep 2018 15:04:38 -0400
Subject: [PATCH] Add lttng-modules bionic jobs

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
 jobs/lttng-modules.yaml             | 2 ++
 scripts/lttng-modules/master.groovy | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/jobs/lttng-modules.yaml b/jobs/lttng-modules.yaml
index 1450a56..d61cf56 100644
--- a/jobs/lttng-modules.yaml
+++ b/jobs/lttng-modules.yaml
@@ -559,6 +559,7 @@
           uversion:
             - trusty
             - xenial
+            - bionic
           buildtype: build
           parambuildtype: build
           kverfloor: ''
@@ -595,6 +596,7 @@
           uversion:
             - trusty
             - xenial
+            - bionic
           buildtype: crossbuild
           parambuildtype: crossbuild
           kverfloor: ''
diff --git a/scripts/lttng-modules/master.groovy b/scripts/lttng-modules/master.groovy
index 323351c..20b2f48 100644
--- a/scripts/lttng-modules/master.groovy
+++ b/scripts/lttng-modules/master.groovy
@@ -330,11 +330,18 @@ def kversionFactory = ""
 if (uversion != null) {
   kversionFactory = new UbuntuKVersion()
   switch (uversion) {
+    case 'bionic':
+      matchStrs = [
+        ~/^refs\/tags\/(Ubuntu-4\.15\.0-\d{1,3}?\.[\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-lts-4\.15\.0-.*_16\.04\.\d+)$/,
       ]
 
       blacklist = [
@@ -350,7 +357,7 @@ if (uversion != null) {
       break
 
     default:
-      println 'Unsupported Ubuntu version: ${uversion}'
+      println "Unsupported Ubuntu version: ${uversion}"
       throw new InterruptedException()
       break
   }
-- 
2.34.1