Merge changes from topic 'add-odl-gerrit'

* changes:
  Add change-merged trigger for ODL Gerrit
  Addd ODL Gerrit parameters to global jjb macros

diff --combined jjb/global/jjb-macros.yaml
index 19a92ad2d1db727524e0499c42a288a0ebafd6a1,1a2f8d2b5a0f74c9fec2d05c2fdf6e41dd333fa2..204ef5c05a6e79c2892801df6d7427ec4150a1a2
--- 1/jjb/global/jjb-macros.yaml
--- 2/jjb/global/jjb-macros.yaml
+++ b/jjb/global/jjb-macros.yaml
@@@ -74,6 -74,22 +74,22 @@@
            default: ssh://$GERRIT_USER@gerrit.acumos.org:29418
            description: SSH URL to Project Repo on Acumos Gerrit to clone repo
  
+ - parameter:
+     name: odl-gerrit-parameters
+     parameters:
+       - string:
+           name: GERRIT_USER
+           default: nordix
+           description: Non-interactive user to stream Gerrit Events on ODL Gerrit
+       - string:
+           name: GIT_BASE_HTTPS
+           default: https://git.opendaylight.org/gerrit
+           description: HTTPS URL to Project Repo on OODL Gerrit to clone repo
+       - string:
+           name: GIT_BASE_SSH
+           default: ssh://$GERRIT_USER@git.opendaylight.org:29418
+           description: SSH URL to Project Repo on ODL Gerrit to clone repo
+ 
  # defaults for job build history
  - property:
      name: logrotate-default
@@@ -148,6 -164,11 +164,6 @@@
                file-paths:
                  - compare-type: 'ANT'
                    pattern: '{files}'
 -          skip-vote:
 -            successful: false
 -            failed: false
 -            unstable: false
 -            notbuilt: false
  
  - trigger:
      name: nordix-gerrit-trigger-change-merged
@@@ -230,6 -251,27 +246,27 @@@
            silent: true
            silent-start: true
  
+ # triggers for ODL Gerrit
+ - trigger:
+     name: odl-gerrit-trigger-change-merged
+     triggers:
+       - gerrit:
+           server-name: 'ODL Gerrit'
+           trigger-on:
+             - change-merged-event
+             - comment-added-contains-event:
+                 comment-contains-value: 'remerge'
+           projects:
+             - project-compare-type: 'ANT'
+               project-pattern: '{project}'
+               branches:
+                 - branch-compare-type: 'ANT'
+                   branch-pattern: '**/{branch}'
+               file-paths:
+                 - compare-type: 'ANT'
+                   pattern: '{files}'
+           silent: true
+           silent-start: true
  
  # wrappers to use for jobs
  - wrapper: