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

diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml
index 9a016366..b96a205b 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,22 @@
           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
+
 # defaults for job build history
 - property:
     name: logrotate-default
@@ -124,7 +140,7 @@
             - comment-added-contains-event:
                 comment-contains-value: 'reverify'
           projects:
-            - project-compare-type: 'ANT'
+            - project-compare-type: 'REG_EXP'
               project-pattern: '{project}'
               branches:
                 - branch-compare-type: 'ANT'
@@ -157,6 +173,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 +210,31 @@
               file-paths:
                 - compare-type: 'ANT'
                   pattern: '{files}'
+          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
+
 
 # wrappers to use for jobs
 - wrapper:
@@ -186,3 +245,40 @@
               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
+
+# wrapper to fix jenkins build workspace permissions
+- wrapper:
+    name: fix-workspace-permissions
+    wrappers:
+      - pre-scm-buildstep:
+          failOnError: true
+          buildsteps:
+            - shell: |
+                #!/bin/bash
+                sudo chown -R $USER:$USER $WORKSPACE || exit 1
+
+- publisher:
+    name: notify-slack
+    publishers:
+      - slack:
+          room: '{slack-channel}'
+          notify-failure: 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