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

diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml
index 3f37cb8b..6a4d11ef 100644
--- a/jjb/global/jjb-macros.yaml
+++ b/jjb/global/jjb-macros.yaml
@@ -5,7 +5,7 @@
     parameters:
       - string:
           name: JJB_GIT_REPO
-          default: https://git.openstack.org/openstack-infra/jenkins-job-builder
+          default: https://review.opendev.org/jjb/jenkins-job-builder
           description: OpenStack JJB repo
       - string:
           name: JJB_VERSION
@@ -106,6 +106,29 @@
           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
+
+# 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
@@ -116,7 +139,7 @@
           artifact-days-to-keep: 60
           artifact-num-to-keep: 200
 
-# defaults for SCM and Gerrit
+# defaults for SCM, Gerrit and GitHub
 - scm:
     name: git-scm
     scm:
@@ -132,8 +155,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,10 +177,35 @@
           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'
 
+- scm:
+    name: git-scm-github
+    scm:
+      - git:
+          url: 'https://github.com/$PROJECT.git'
+          branches:
+            - '*/{branch}'
+          refspec: '{refspec}'
+          timeout: 15
+          per-build-tag: false
+          skip-tag: true
+          shallow-clone: false
+          use-author: false
+          ignore-notify: false
+          wipe-workspace: '{wipe_workspace}'
+          prune: false
+          clean:
+            after: false
+            before: '{clean_before}'
+          choosing-strategy: 'default'
+          basedir: '{base_dir}'
+
 # triggers for Nordix Gerrit
 - trigger:
     name: nordix-gerrit-trigger-patchset-created
@@ -223,6 +274,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
@@ -311,6 +382,28 @@
           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
+
 # wrappers to use for jobs
 - wrapper:
     name: nordixinfra-jjb-creds-wrapper
@@ -346,7 +439,10 @@
     publishers:
       - slack:
           room: '{slack-channel}'
-          notify-failure: 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: