X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fglobal%2Fjjb-macros.yaml;h=9db98c31a5d933bb5907a14f795ce779d41fec7f;hb=refs%2Fchanges%2F25%2F6325%2F2;hp=b665ac7c99b371ac2ce1c46c60b6373002a80131;hpb=66df1dd44a22ba272c336a56e986331e3f7320fd;p=infra%2Fcicd.git

diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml
index b665ac7c..9db98c31 100644
--- a/jjb/global/jjb-macros.yaml
+++ b/jjb/global/jjb-macros.yaml
@@ -5,12 +5,16 @@
     parameters:
       - string:
           name: JJB_GIT_REPO
-          default: https://review.opendev.org/jjb/jenkins-job-builder
-          description: OpenStack JJB repo
+          default: https://opendev.org/jjb/jenkins-job-builder.git
+          description: OpenDev JJB repo
       - string:
           name: JJB_VERSION
           default: 2.9.1
-          description: OpenStack JJB version to install - matches to LFN JJB version
+          description: OpenDev JJB version to install - matches to LFN JJB version
+      - string:
+          name: NORDIX_REGISTRY
+          default: registry.nordix.org
+          description: Nordix Container Image Registry
 
 # these parameters are used for setting the Gerrit Project on Nordix
 - parameter:
@@ -106,6 +110,45 @@
           default: ssh://$GERRIT_USER@review.opendev.org:29418
           description: SSH URL to Project Repo on OpenDev Gerrit to clone repo
 
+- parameter:
+    name: oransc-gerrit-parameters
+    parameters:
+      - string:
+          name: GERRIT_USER
+          default: nordix
+          description: Non-interactive user to stream Gerrit Events on ORAN-SC Gerrit
+      - string:
+          name: GIT_BASE_HTTPS
+          default: https://gerrit.o-ran-sc.org/r
+          description: HTTPS URL to Project Repo on ORAN-SC Gerrit to clone repo
+      - string:
+          name: GIT_BASE_SSH
+          default: ssh://$GERRIT_USER@gerrit.o-ran-sc.org:29418
+          description: SSH URL to Project Repo on ORAN-SC Gerrit to clone repo
+
+- parameter:
+    name: fdio-gerrit-parameters
+    parameters:
+      - string:
+          name: GERRIT_USER
+          default: nordix
+          description: Non-interactive user to stream Gerrit Events on Fast Data Project Gerrit
+      - string:
+          name: GIT_BASE_HTTPS
+          default: https://gerrit.fd.io/r
+          description: HTTPS URL to Project Repo on Fast Data Project Gerrit to clone repo
+      - string:
+          name: GIT_BASE_SSH
+          default: ssh://$GERRIT_USER@gerrit.fd.io:29418
+          description: SSH URL to Project Repo on Fast Data Project Gerrit to clone repo
+
+# Verify job for Geode git tags to make sure there are in agreed format
+- builder:
+    name: 'verify-geode-tag-macro'
+    builders:
+      - shell:
+          !include-raw: ./verify_geode_tag.sh
+
 # defaults for job build history
 - property:
     name: logrotate-default
@@ -359,6 +402,50 @@
           silent: true
           silent-start: true
 
+# triggers for ORANSC Gerrit
+- trigger:
+    name: oransc-gerrit-trigger-change-merged
+    triggers:
+      - gerrit:
+          server-name: 'ORANSC 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 Fast Data Project Gerrit
+- trigger:
+    name: fdio-gerrit-trigger-change-merged
+    triggers:
+      - gerrit:
+          server-name: 'FDio 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
@@ -369,6 +456,16 @@
               username: JJB_USERNAME
               password: JJB_USERTOKEN
 
+# wrappers to use for jobs
+- wrapper:
+    name: nordixinfra-harbor-creds-wrapper
+    wrappers:
+      - credentials-binding:
+          - username-password-separated:
+              credential-id: nordix-cicd-harbor-credentials
+              username: HARBOR_USERNAME
+              password: HARBOR_PASSWORD
+
 # timeout wrapper to use for jobs
 - wrapper:
     name: build-timeout
@@ -394,8 +491,10 @@
     publishers:
       - slack:
           room: '{slack-channel}'
-          notify-failure: true
-          notify-back-to-normal: true
+          notify-start: '{notify-start}'
+          notify-success: '{notify-success}'
+          notify-failure: '{notify-failure}'
+          notify-back-to-normal: '{notify-back-to-normal}'
 
 # property to discard old builds
 - property: