X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fglobal%2Fjjb-macros.yaml;h=1a2f8d2b5a0f74c9fec2d05c2fdf6e41dd333fa2;hb=d888b0bec7a8061e85455aab7fdd482b7cb56df2;hp=a12398420076fc4e5546baaa3801d437604ce402;hpb=22605d597ac78eb8b1c9f1349bd1e9fb60d55cc5;p=infra%2Fcicd.git

diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml
index a1239842..1a2f8d2b 100644
--- a/jjb/global/jjb-macros.yaml
+++ b/jjb/global/jjb-macros.yaml
@@ -9,7 +9,7 @@
           description: OpenStack JJB repo
       - string:
           name: JJB_VERSION
-          default: 2.2.1
+          default: 2.9.1
           description: OpenStack JJB version to install - matches to LFN JJB version
 
 # these parameters are used for setting the Gerrit Project on Nordix
@@ -58,6 +58,38 @@
           default: ssh://$GERRIT_USER@gerrit.onap.org:29418
           description: SSH URL to Project Repo on ONAP Gerrit to clone repo
 
+- parameter:
+    name: acumos-gerrit-parameters
+    parameters:
+      - string:
+          name: GERRIT_USER
+          default: nordix
+          description: Non-interactive user to stream Gerrit Events on Acumos Gerrit
+      - string:
+          name: GIT_BASE_HTTPS
+          default: https://gerrit.acumos.org/r/p
+          description: HTTPS URL to Project Repo on Acumos Gerrit to clone repo
+      - string:
+          name: GIT_BASE_SSH
+          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
@@ -197,6 +229,50 @@
           silent: true
           silent-start: true
 
+# triggers for Acumos Gerrit
+- trigger:
+    name: acumos-gerrit-trigger-change-merged
+    triggers:
+      - gerrit:
+          server-name: 'Acumos 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
+
+# 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:
     name: nordixinfra-jjb-creds-wrapper