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

diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml
index 8d6428ed..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://opendev.org/jjb/jenkins-job-builder.git
-          description: OpenDev JJB repo
-      - string:
-          name: JJB_VERSION
-          default: 2.9.1
-          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:
     name: project-parameters
@@ -472,10 +455,20 @@
     wrappers:
       - credentials-binding:
           - username-password-separated:
-              credential-id: nordix-eiffel-github-token
+              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