Merge "Make Merge and Verify job triggers overrideable"

diff --combined jjb/lf-python-jobs.yaml
index 74ce9df,99c0661..7f7fb50
--- 1/jjb/lf-python-jobs.yaml
--- 2/jjb/lf-python-jobs.yaml
+++ b/jjb/lf-python-jobs.yaml
@@@ -40,7 -40,7 +40,7 @@@
      branch: master
      build-timeout: 10
      git-url: '$GIT_URL/$GERRIT_PROJECT'
 -    stream: '{stream}'
 +    stream: master
      submodule-recursive: true
      tox-dir: ''
      tox-envs: ''
@@@ -90,6 -90,23 +90,23 @@@
      id: gerrit-tox-verify
      <<: *lf_tox_verify
  
+     ######################
+     # Default parameters #
+     ######################
+ 
+     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 #
+     #####################
+ 
      scm:
        - lf-infra-gerrit-scm:
            jenkins-ssh-credential: '{jenkins-ssh-credential}'
@@@ -102,14 -119,7 +119,7 @@@
      triggers:
        - gerrit:
            server-name: '{gerrit-server-name}'
-           trigger-on:
-             - 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$
+           trigger-on: '{obj:gerrit_verify_triggers}'
            projects:
              - project-compare-type: ANT
                project-pattern: '{project}'