X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fglobal%2Fjjb-macros.yaml;h=b85365255aefb9c425a0f165bd14d1ad249b0e57;hb=ab49178bfd1199c59d929ebf396e5d87f9a315f6;hp=c98268cf77421e127e1dc8ce83506b1b87b7c23d;hpb=1b84bf799821954ae9dce95842eb9cbef4d74aa3;p=infra%2Fcicd.git

diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml
index c98268cf..b8536525 100644
--- a/jjb/global/jjb-macros.yaml
+++ b/jjb/global/jjb-macros.yaml
@@ -1,21 +1,4 @@
 ---
-# these parameters are used for infra related variables
-- parameter:
-    name: infra-parameters
-    parameters:
-      - string:
-          name: JJB_GIT_REPO
-          default: https://review.opendev.org/jjb/jenkins-job-builder
-          description: OpenStack JJB repo
-      - string:
-          name: JJB_VERSION
-          default: 2.9.1
-          description: OpenStack 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:
     name: project-parameters
@@ -126,6 +109,22 @@
           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'
@@ -408,6 +407,28 @@
           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
@@ -428,6 +449,26 @@
               username: HARBOR_USERNAME
               password: HARBOR_PASSWORD
 
+# wrappers to use for jobs
+- wrapper:
+    name: nordixinfra-eiffel-github-token
+    wrappers:
+      - credentials-binding:
+          - username-password-separated:
+              credential-id: nordixinfra-eiffel-username-personal-access-token
+              username: NORDIXINFRA_GITHUB_USERNAME
+              password: NORDIXINFRA_GITHUB_TOKEN
+
+# wrappers to use for jobs
+- wrapper:
+    name: nordix-gerrit-http-api-token
+    wrappers:
+      - credentials-binding:
+          - username-password-separated:
+              credential-id: nordixinfra-nordix-gerrit-http-api-token
+              username: GERRIT_USER
+              password: GERRIT_API_KEY
+
 # timeout wrapper to use for jobs
 - wrapper:
     name: build-timeout