From a3c2d81cf2ce11c82baf39c3a7ee2c3d76abd40b Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Wed, 26 Aug 2015 11:33:16 -0400
Subject: [PATCH] Improve reliability of kernel jobs

---
 jobs/kernel.yaml        | 32 ++++++++++++++++++--------------
 jobs/lttng-modules.yaml | 27 +++++++++++++++++----------
 2 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/jobs/kernel.yaml b/jobs/kernel.yaml
index cb968d2..0bc9255 100644
--- a/jobs/kernel.yaml
+++ b/jobs/kernel.yaml
@@ -2,7 +2,9 @@
 - defaults:
     name: kernel
     description: |
-      TODO
+      Prepare kernel tree for OOT build of lttng-modules
+
+      <p>Job is managed by Jenkins Job Builder.</p>
 
     project-type: freestyle
 
@@ -17,21 +19,22 @@
       - timestamps
       - ansicolor
 
-    scm:
-      - git:
-          url: git://artifacts.internal.efficios.com/git/linux-stable.git
-          branches:
-            - refs/tags/v{kversion}
-          shallow-clone: true
-          skip-tag: true
-          fastpoll: true
-          basedir: linux
-          reference-repo: $HOME/gitcache/linux-stable.git/
+    #scm:
+    #  - git:
+    #      url: git://artifacts.internal.efficios.com/git/linux-stable.git
+    #      branches:
+    #        - refs/tags/v{kversion}
+    #      shallow-clone: true
+    #      skip-tag: true
+    #      fastpoll: true
+    #      basedir: linux
+    #      reference-repo: $HOME/gitcache/linux-stable.git/
 
     properties:
       - throttle:
           max-per-node: 0
           max-total: 0
+          option: category
           categories:
             - 'lttng-module-linux'
 
@@ -42,6 +45,7 @@
     defaults: kernel
 
     project-type: matrix
+    node: 'x86-32 || x86-64' # Applies only to matrix flyweight task
     axes:
       - axis:
          type: slave
@@ -49,6 +53,8 @@
          values: '{obj:arch}'
 
     builders:
+      - shell: |
+          git clone --depth=1 -b "v{kversion}" --reference $HOME/gitcache/linux-stable.git/ git://artifacts.internal.efficios.com/git/linux-stable.git linux
       - shell:
          !include-raw-escape scripts/kernel/build.sh
 
@@ -57,9 +63,7 @@
           artifacts: 'build/**'
           allow-empty: false
           fingerprint: true
-      - trigger:
-          project: lttng-modules_master_{kversion}_{buildtype}
-          threshold: SUCCESS
+      - workspace-cleanup
 
 
 ## Project
diff --git a/jobs/lttng-modules.yaml b/jobs/lttng-modules.yaml
index 23eb06b..0c837ad 100644
--- a/jobs/lttng-modules.yaml
+++ b/jobs/lttng-modules.yaml
@@ -2,7 +2,9 @@
 - defaults:
     name: lttng-modules
     description: |
-      TODO
+      Build lttng-modules against different Linux kernels.
+
+      <p>Job is managed by Jenkins Job Builder.</p>
 
     project-type: freestyle
 
@@ -18,15 +20,15 @@
       - ansicolor
 
     scm:
-      - git:
-          url: git://artifacts.internal.efficios.com/git/linux-stable.git
-          branches:
-            - refs/tags/v{kversion}
-          shallow-clone: true
-          skip-tag: true
-          fastpoll: true
-          basedir: linux
-          reference-repo: $HOME/gitcache/linux-stable.git/
+      #- git:
+      #    url: git://artifacts.internal.efficios.com/git/linux-stable.git
+      #    branches:
+      #      - refs/tags/v{kversion}
+      #    shallow-clone: true
+      #    skip-tag: true
+      #    fastpoll: true
+      #    basedir: linux
+      #    reference-repo: $HOME/gitcache/linux-stable.git/
       - git:
           url: git://github.com/lttng/lttng-modules.git
           branches:
@@ -37,6 +39,7 @@
       - throttle:
           max-per-node: 0
           max-total: 0
+          option: category
           categories:
             - 'lttng-module-linux'
 
@@ -47,6 +50,7 @@
     defaults: lttng-modules
 
     project-type: matrix
+    node: 'x86_32 || x86_64' # Applies only to matrix flyweight task
     axes:
       - axis:
          type: slave
@@ -60,6 +64,8 @@
           stable: true
           filter: 'build/**'
           target: 'deps/linux'
+      - shell: |
+          git clone --depth=1 -b "v{kversion}" --reference $HOME/gitcache/linux-stable.git/ git://artifacts.internal.efficios.com/git/linux-stable.git linux
       - shell:
               !include-raw-escape scripts/lttng-modules/build.sh
 
@@ -68,6 +74,7 @@
           artifacts: 'build/**'
           allow-empty: false
           fingerprint: true
+      - workspace-cleanup
 
 
 ## Project
-- 
2.34.1