From: Eric Ball <eball@linuxfoundation.org>
Date: Thu, 9 May 2019 20:18:59 +0000 (-0700)
Subject: Adjust kni gerrit trigger to pick up merges
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=c464c186835668e59f6898a654100b1e29047a4c

Adjust kni gerrit trigger to pick up merges

The original trigger appears to have been pulled from a verify job
rather than a merge job. This should fix build-on-merge function.

Change-Id: I77ba8479801a82a5d1d3e670ba8822cb773cfdb9
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
---

diff --git a/jjb/akraino-templates/akraino-jjb-kni.yaml b/jjb/akraino-templates/akraino-jjb-kni.yaml
index be1f9c1..d3febe2 100644
--- a/jjb/akraino-templates/akraino-jjb-kni.yaml
+++ b/jjb/akraino-templates/akraino-jjb-kni.yaml
@@ -55,6 +55,10 @@
       - comment-added-contains-event:
           comment-contains-value: remerge$
 
+    gerrit_trigger_file_paths:
+      - compare-type: ANT
+        pattern: '**'
+
     scm:
       - lf-infra-gerrit-scm:
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@ -68,16 +72,14 @@
     triggers:
       - gerrit:
           server-name: '{gerrit-server-name}'
-          trigger-on:
-            - patchset-created-event:
-                exclude-drafts: 'false'
-                exclude-trivial-rebase: 'false'
-                exclude-no-code-change: 'false'
-            - change-merged-event
-            - comment-added-contains-event:
-                comment-contains-value: 'recheck'
-            - comment-added-contains-event:
-                comment-contains-value: 'reverify'
+          trigger-on: '{obj:gerrit_merge_triggers}'
+          projects:
+            - project-compare-type: ANT
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: '**/{branch}'
+              file-paths: '{obj:gerrit_trigger_file_paths}'
 
     builders:
       - lf-infra-pre-build