X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fglobal%2Fjjb-macros.yaml;h=534e61c8d085c0be70e7a05fd2e65bd05e7d50c1;hb=refs%2Fchanges%2F27%2F1627%2F1;hp=1a2f8d2b5a0f74c9fec2d05c2fdf6e41dd333fa2;hpb=3df9f091047e718dcedfa1c980b466f3db7a6590;p=infra%2Fcicd.git

diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml
index 1a2f8d2b..534e61c8 100644
--- a/jjb/global/jjb-macros.yaml
+++ b/jjb/global/jjb-macros.yaml
@@ -90,6 +90,22 @@
           default: ssh://$GERRIT_USER@git.opendaylight.org:29418
           description: SSH URL to Project Repo on ODL Gerrit to clone repo
 
+- parameter:
+    name: opendev-gerrit-parameters
+    parameters:
+      - string:
+          name: GERRIT_USER
+          default: nordix
+          description: Non-interactive user to stream Gerrit Events on OpenDev Gerrit
+      - string:
+          name: GIT_BASE_HTTPS
+          default: https://review.opendev.org
+          description: HTTPS URL to Project Repo on OpenDev Gerrit to clone repo
+      - string:
+          name: GIT_BASE_SSH
+          default: ssh://$GERRIT_USER@review.opendev.org:29418
+          description: SSH URL to Project Repo on OpenDev Gerrit to clone repo
+
 # defaults for job build history
 - property:
     name: logrotate-default
@@ -116,8 +132,11 @@
           shallow-clone: false
           use-author: false
           ignore-notify: false
-          wipe-workspace: true
+          wipe-workspace: '{wipe_workspace}'
           prune: false
+          clean:
+            after: false
+            before: '{clean_before}'
           choosing-strategy: 'default'
 
 - scm:
@@ -135,8 +154,11 @@
           shallow-clone: false
           use-author: false
           ignore-notify: false
-          wipe-workspace: true
+          wipe-workspace: '{wipe_workspace}'
           prune: false
+          clean:
+            after: false
+            before: '{clean_before}'
           choosing-strategy: 'gerrit'
 
 # triggers for Nordix Gerrit
@@ -207,6 +229,26 @@
                 - compare-type: 'ANT'
                   pattern: '{files}'
 
+- trigger:
+    name: nordix-gerrit-patchset-created-or-push-upstream
+    triggers:
+      - gerrit:
+          server-name: 'Nordix Gerrit'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'push-upstream'
+            - patchset-created-event:
+                exclude-drafts: true
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: 'ANT'
+                  pattern: '{files}'
+
 # triggers for ONAP Gerrit
 - trigger:
     name: onap-gerrit-trigger-change-merged
@@ -273,6 +315,28 @@
           silent: true
           silent-start: true
 
+# triggers for OpenDev Gerrit
+- trigger:
+    name: opendev-gerrit-trigger-change-merged
+    triggers:
+      - gerrit:
+          server-name: 'OpenDev 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
@@ -308,7 +372,8 @@
     publishers:
       - slack:
           room: '{slack-channel}'
-          notify-failure: True
+          notify-failure: true
+          notify-back-to-normal: true
 
 # property to discard old builds
 - property: