From f92a1ef0646cb1cecdd121c0c4e0ba58c97f24f8 Mon Sep 17 00:00:00 2001
From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Sun, 15 Oct 2017 14:40:43 -0400
Subject: [PATCH] Standardize gerrit_[merge|verify]_triggers

It turns out you can override per job definition inside of a projects
declaration so let's standardize the trigger wording so that they are
the same everywhere.

Change-Id: Id489a3b04242183a35d56bb938c66b4b486a1d1f
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---
 jjb/lf-maven-jobs.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index 736c4e95..cde9177e 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -215,7 +215,7 @@
     #     :submodule-recursive: Whether to checkout submodules recursively.
     #         (default: true)
     #
-    #     :gerrit_javadoc_merge_triggers: Override Gerrit Triggers.
+    #     :gerrit_merge_triggers: Override Gerrit Triggers.
 
     ######################
     # Default parameters #
@@ -234,7 +234,7 @@
     stream: master
     submodule-recursive: true
 
-    gerrit_javadoc_merge_triggers:
+    gerrit_merge_triggers:
       - change-merged-event
       - comment-added-contains-event:
           comment-contains-value: remerge$
@@ -281,7 +281,7 @@
     triggers:
       - gerrit:
           server-name: '{gerrit-server-name}'
-          trigger-on: '{obj:gerrit_javadoc_merge_triggers}'
+          trigger-on: '{obj:gerrit_merge_triggers}'
           projects:
             - project-compare-type: ANT
               project-pattern: '{project}'
@@ -357,7 +357,7 @@
     #     :submodule-recursive: Whether to checkout submodules recursively.
     #         (default: true)
     #
-    #     :gerrit_javadoc_verify_triggers: Override Gerrit Triggers.
+    #     :gerrit_verify_triggers: Override Gerrit Triggers.
 
     ######################
     # Default parameters #
@@ -376,7 +376,7 @@
     stream: master
     submodule-recursive: true
 
-    gerrit_javadoc_verify_triggers:
+    gerrit_verify_triggers:
       - patchset-created-event:
           exclude-drafts: true
           exclude-trivial-rebase: false
@@ -419,7 +419,7 @@
     triggers:
       - gerrit:
           server-name: '{gerrit-server-name}'
-          trigger-on: '{obj:gerrit_javadoc_verify_triggers}'
+          trigger-on: '{obj:gerrit_verify_triggers}'
           projects:
             - project-compare-type: ANT
               project-pattern: '{project}'
-- 
2.16.6