X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fglobal%2Fjjb-macros.yaml;h=b9040e4a4f3e5057be53acde99430730ab616dd5;hb=f63577d1695c69a72ebf7393647964381f4585b1;hp=3f37cb8ba9e9a91d731e81da07264e6ee30376fb;hpb=29c6ceda9774f4a5de1cd3880a20214b6d420c5d;p=infra%2Fcicd.git

diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml
index 3f37cb8b..b9040e4a 100644
--- a/jjb/global/jjb-macros.yaml
+++ b/jjb/global/jjb-macros.yaml
@@ -132,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:
@@ -151,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
@@ -223,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