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

diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml
index 58ba0f48..c98268cf 100644
--- a/jjb/global/jjb-macros.yaml
+++ b/jjb/global/jjb-macros.yaml
@@ -11,6 +11,10 @@
           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:
@@ -122,6 +126,13 @@
           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
@@ -407,6 +418,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