From: Fatih Degirmenci <fdegir@gmail.com>
Date: Mon, 22 Oct 2018 22:20:43 +0000 (+0200)
Subject: Switch to ssh for git scm
X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=9a746acd1ff296996a51bc8a7cd82c9b48303fd4;p=infra%2Fcicd.git

Switch to ssh for git scm

Change-Id: Ib165eddfd3f63e90d51fb55bc7fc3985ee0f7001
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
---

diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml
index c5cd27f8e..78392e76e 100644
--- a/jjb/global/jjb-macros.yaml
+++ b/jjb/global/jjb-macros.yaml
@@ -35,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
@@ -51,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:
@@ -73,7 +81,8 @@
     name: git-scm
     scm:
       - git:
-          url: '$GIT_BASE_HTTPS/$PROJECT'
+          url: '$GIT_BASE_SSH/$PROJECT'
+          credentials-id: '$CREDENTIALS_ID'
           branches:
             - 'refs/heads/{branch}'
           refspec: '{refspec}'
@@ -91,7 +100,8 @@
     name: git-scm-gerrit
     scm:
       - git:
-          url: '$GIT_BASE_HTTPS/$PROJECT'
+          url: '$GIT_BASE_SSH/$PROJECT'
+          credentials-id: '$CREDENTIALS_ID'
           branches:
             - 'refs/heads/{branch}'
           refspec: '{refspec}'