From 104b6bedf338b017ad2b794bb886a235a9372185 Mon Sep 17 00:00:00 2001
From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Sun, 17 Sep 2017 00:32:10 -0400
Subject: [PATCH] Fix RTD Verify job Gerrit Triggers

The verify job was incorrectly setup as a merge job trigger causing
RTD builds to not trigger as expected.

Change-Id: I2502eff209deb7b077e64c620c77d4ecbfbc9a8e
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---
 .../expected-xml/gerrit-rtd-rtd-verify-master      |  7 ++++-
 jjb/lf-rtd-jobs.yaml                               | 32 +++++++++++++---------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master b/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master
index 70106339..e102182a 100644
--- a/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master
+++ b/.jjb-test/expected-xml/gerrit-rtd-rtd-verify-master
@@ -162,7 +162,12 @@ For example '&lt;1.0.0' or '&gt;=1.0.0,&lt;2.0.0'.
       <triggerConfigURL/>
       <allowTriggeringUnreviewedPatches>false</allowTriggeringUnreviewedPatches>
       <triggerOnEvents>
-        <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginChangeMergedEvent/>
+        <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginPatchsetCreatedEvent>
+          <excludeDrafts>false</excludeDrafts>
+          <excludeTrivialRebase>false</excludeTrivialRebase>
+          <excludeNoCodeChange>false</excludeNoCodeChange>
+        </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginPatchsetCreatedEvent>
+        <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginDraftPublishedEvent/>
         <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginCommentAddedContainsEvent>
           <commentAddedCommentContains>recheck$</commentAddedCommentContains>
         </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginCommentAddedContainsEvent>
diff --git a/jjb/lf-rtd-jobs.yaml b/jjb/lf-rtd-jobs.yaml
index 6dc3a991..ad1e6af4 100644
--- a/jjb/lf-rtd-jobs.yaml
+++ b/jjb/lf-rtd-jobs.yaml
@@ -24,15 +24,7 @@
 - lf_rtd_common: &lf_rtd_common
     name: lf-rtd-common
     # RTD verify and merge jobs are the same except for their scm, trigger, and
-    # builders definition. This anchor is the common template
-    #
-    # Optional parameters:
-    #     :gerrit_trigger_file_paths: Override file paths which can be used to
-    #         filter which file modifications will trigger a build.
-    #         (default: - compare-type: ANT
-    #                     pattern: '**/*.rst'
-    #                   - compare-type: ANT
-    #                     pattern: '**/conf.py')
+    # builders definition. This anchor is the common template.
 
     ######################
     # Default parameters #
@@ -184,6 +176,14 @@
     #         Often the same as the branch. (default: master)
     #     :submodule-recursive: Whether to checkout submodules recursively.
     #         (default: true)
+    #
+    #     :gerrit_verify_triggers: Override Gerrit Triggers.
+    #     :gerrit_trigger_file_paths: Override file paths which can be used to
+    #         filter which file modifications will trigger a build.
+    #         (default: - compare-type: ANT
+    #                     pattern: '**/*.rst'
+    #                   - compare-type: ANT
+    #                     pattern: '**/conf.py')
 
     ######################
     # Default parameters #
@@ -198,6 +198,15 @@
     stream: master
     submodule-recursive: true
 
+    gerrit_verify_triggers:
+      - patchset-created-event:
+          exclude-drafts: false
+          exclude-trivial-rebase: false
+          exclude-no-code-change: false
+      - draft-published-event
+      - comment-added-contains-event:
+          comment-contains-value: recheck$
+
     #####################
     # Job Configuration #
     #####################
@@ -226,10 +235,7 @@
     triggers:
       - gerrit:
           server-name: '{gerrit-server-name}'
-          trigger-on:
-            - change-merged-event
-            - comment-added-contains-event:
-                comment-contains-value: 'recheck$'
+          trigger-on: '{obj:gerrit_verify_triggers}'
           projects:
             - project-compare-type: 'ANT'
               project-pattern: '{project-pattern}'
-- 
2.16.6