Add Jenkins merge job

Change-Id: I1e612728832fe73fa5f637b6bb66978e49a8c0b1
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/jjb/releng/releng-jobs.yaml b/jjb/releng/releng-jobs.yaml
index 02bc89d..f349d63 100644 (file)
--- a/jjb/releng/releng-jobs.yaml
+++ b/jjb/releng/releng-jobs.yaml
@@ -27,6 +27,21 @@
                 - branch-compare-type: 'ANT'
                   branch-pattern: 'master'
 
+- trigger:
+    name: releng-patchset-merged
+    triggers:
+      - gerrit:
+          trigger-on:
+            - change-merged-event
+            - comment-added-contains-event:
+                comment-contains-value: 'remerge'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: 'releng'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: 'master'
+
 - builder:
     name: jjb-verify
     builders:
@@ -39,6 +54,17 @@
           jenkins-jobs test --recursive -o tmp jjb/
           rm -rf tmp
 
+- builder:
+    name: jjb-merge
+    builders:
+      - shell: |
+          sudo apt-get -o DPkg::Lock::Timeout=300 update && \
+          sudo DEBIAN_FRONTEND=noninteractive apt-get \
+            -o DPkg::Lock::Timeout=300 dist-upgrade -y
+          sudo DEBIAN_FRONTEND=noninteractive \
+          apt-get -o DPkg::Lock::Timeout=300 install jenkins-job-builder -y
+          jenkins-jobs update --recursive --delete-old jjb/
+
 - parameter:
     name: jjb-slave
     parameters:
@@ -64,6 +90,23 @@
     jobs:
       - 'jjb-verify'
 
+- job-template:
+    name: jjb-merge
+    triggers:
+      - releng-patchset-merged
+    scm:
+      - releng-scm:
+          ref: master
+    parameters:
+      - jjb-slave:
+          slave: lf-virtual1
+    builders:
+      - jjb-merge
+
+- project:
+    name: jjb-merge
+    jobs:
+      - jjb-merge
 
 - project:
     name: releng-builder-jobs