From 7343a81f3a30e98371b292e5642719801615a068 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Sun, 17 Sep 2017 00:32:10 -0400 Subject: [PATCH] RTD Merge job GTriggers should be overridable Change-Id: I2193129790709c2232ebcd283e25cca8efb978e3 Signed-off-by: Thanh Ha --- jjb/lf-rtd-jobs.yaml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/jjb/lf-rtd-jobs.yaml b/jjb/lf-rtd-jobs.yaml index ad1e6af4..5461ae85 100644 --- a/jjb/lf-rtd-jobs.yaml +++ b/jjb/lf-rtd-jobs.yaml @@ -86,6 +86,14 @@ # :project-pattern: Project to trigger build against. (default: **) # :stream: Keyword that can be used to represent a release code-name. # Often the same as the branch. (default: master) + # + # :gerrit_merge_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 # @@ -99,6 +107,11 @@ stream: master submodule-recursive: true + gerrit_merge_triggers: + - change-merged-event + - comment-added-contains-event: + comment-contains-value: remerge$ + ##################### # Job Configuration # ##################### @@ -117,10 +130,7 @@ triggers: - gerrit: server-name: '{gerrit-server-name}' - trigger-on: - - change-merged-event - - comment-added-contains-event: - comment-contains-value: 'remerge$' + trigger-on: '{obj:gerrit_merge_triggers}' projects: - project-compare-type: 'ANT' project-pattern: '{project-pattern}' -- 2.16.6