X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fglobal%2Fjjb-macros.yaml;h=9630a91753560a8999cbfd9ddcd0d78d8b9c03b3;hb=refs%2Fchanges%2F44%2F344%2F1;hp=9a016366f7e449b7a8d13238026d0bedae8587dc;hpb=a2beeb2cade734853d6636143686e34ee5c2e8c8;p=infra%2Fcicd.git

diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml
index 9a016366..9630a917 100644
--- a/jjb/global/jjb-macros.yaml
+++ b/jjb/global/jjb-macros.yaml
@@ -157,6 +157,24 @@
                 - compare-type: 'ANT'
                   pattern: '{files}'
 
+- trigger:
+    name: nordix-gerrit-push-upstream
+    triggers:
+      - gerrit:
+          server-name: 'Nordix Gerrit'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'push-upstream'
+          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
@@ -176,6 +194,8 @@
               file-paths:
                 - compare-type: 'ANT'
                   pattern: '{files}'
+          silent: true
+          silent-start: true
 
 # wrappers to use for jobs
 - wrapper:
@@ -186,3 +206,30 @@
               credential-id: nordixinfra-jjb-creds
               username: JJB_USERNAME
               password: JJB_USERTOKEN
+
+# timeout wrapper to use for jobs
+- wrapper:
+    name: build-timeout
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+          timeout-var: 'BUILD_TIMEOUT'
+          fail: true
+
+- publisher:
+    name: notify-slack
+    publishers:
+      - slack:
+          room: '{slack-channel}'
+          notify-failure: True
+          notify-back-to-normal: True
+
+# property to discard old builds
+- property:
+    name: logrotate
+    properties:
+      - build-discarder:
+          days-to-keep: 30
+          num-to-keep: 100
+          artifact-days-to-keep: 30
+          artifact-num-to-keep: 100