Switch to ssh for git scm

[infra/cicd.git] / jjb / global / jjb-macros.yaml

diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml
index cfe19edf2d938fec5c727acb1f0c98ea8bef85af..78392e76e89b7cf2c9fac915f3bec7fa52f10f45 100644 (file)
--- a/jjb/global/jjb-macros.yaml
+++ b/jjb/global/jjb-macros.yaml
@@ -1,7 +1,7 @@
 ---
 # these parameters are used for infra related variables
 - parameter:
-    name: infra-parameter
+    name: infra-parameters
     parameters:
       - string:
           name: JJB_GIT_REPO
@@ -14,12 +14,16 @@
 
 # these parameters are used for setting the Gerrit Project on Nordix
 - parameter:
-    name: project-parameter
+    name: project-parameters
     parameters:
       - string:
           name: PROJECT
           default: '{project}'
           description: JJB configured PROJECT parameter to identify a Nordix Gerrit project
+      - string:
+          name: BRANCH
+          default: '{branch}'
+          description: "JJB configured BRANCH parameter (e.g. master, nordix-dev)"
 
 # these parameters are used for streaming changes from various Gerrit Systems
 - parameter:
@@ -31,12 +35,16 @@
           description: Non-interactive user to stream Gerrit Events on Nordix Gerrit
       - string:
           name: GIT_BASE_HTTPS
-          default: https://gerrit.nordix.org/
+          default: https://gerrit.nordix.org
           description: HTTPS URL of Project Repo on Nordix Gerrit to clone repo
       - string:
           name: GIT_BASE_SSH
-          default: ssh://$GERRIT_USER@gerrit.nordix.org:29418/
+          default: ssh://$GERRIT_USER@gerrit.nordix.org:29418
           description: HTTPS URL of Project Repo on Nordix Gerrit to clone repo
+      - string:
+          name: CREDENTIALS_ID
+          default: nordixinfra-nordix-gerrit-ssh
+          description: Nordix Infra SSH credentials for Nordix Gerrit
 
 - parameter:
     name: onap-gerrit-parameters
@@ -47,12 +55,16 @@
           description: Non-interactive user to stream Gerrit Events on ONAP Gerrit
       - string:
           name: GIT_BASE_HTTPS
-          default: https://gerrit.onap.org/r/p/
+          default: https://gerrit.onap.org/r/p
           description: HTTPS URL to Project Repo on ONAP Gerrit to clone repo
       - string:
           name: GIT_BASE_SSH
-          default: ssh://$GERRIT_USER@gerrit.onap.org:29418/
+          default: ssh://$GERRIT_USER@gerrit.onap.org:29418
           description: SSH URL to Project Repo on ONAP Gerrit to clone repo
+      - string:
+          name: CREDENTIALS_ID
+          default: nordixinfra-lfn-gerrit-ssh
+          description: Nordix Infra SSH credentials for LFN Gerrit
 
 # defaults for job build history
 - property:
@@ -68,10 +80,12 @@
 - scm:
     name: git-scm
     scm:
-      - git: &git-scm-defaults
-          url: '$GIT_BASE_HTTPS'
+      - git:
+          url: '$GIT_BASE_SSH/$PROJECT'
+          credentials-id: '$CREDENTIALS_ID'
           branches:
-            - 'origin/$BRANCH'
+            - 'refs/heads/{branch}'
+          refspec: '{refspec}'
           timeout: 15
           per-build-tag: false
           skip-tag: true
@@ -80,14 +94,26 @@
           ignore-notify: false
           wipe-workspace: true
           prune: false
+          choosing-strategy: 'default'
 
 - scm:
     name: git-scm-gerrit
     scm:
       - git:
+          url: '$GIT_BASE_SSH/$PROJECT'
+          credentials-id: '$CREDENTIALS_ID'
+          branches:
+            - 'refs/heads/{branch}'
+          refspec: '{refspec}'
+          timeout: 15
+          per-build-tag: false
+          skip-tag: true
+          shallow-clone: false
+          use-author: false
+          ignore-notify: false
+          wipe-workspace: true
+          prune: false
           choosing-strategy: 'gerrit'
-          refspec: '$GERRIT_REFSPEC'
-          <<: *git-scm-defaults
 
 # triggers for Nordix and upstream Gerrits
 - trigger:
@@ -138,3 +164,13 @@
               file-paths:
                 - compare-type: 'ANT'
                   pattern: '{files}'
+
+# wrappers to use for jobs
+- wrapper:
+    name: nordixinfra-jjb-creds-wrapper
+    wrappers:
+      - credentials-binding:
+          - username-password-separated:
+              credential-id: nordixinfra-jjb-creds
+              username: JJB_USERNAME
+              password: JJB_USERTOKEN