From 627036b6c3c4fc938a5ce3fa685fe2426a07a39f Mon Sep 17 00:00:00 2001
From: Fatih Degirmenci <fdegir@gmail.com>
Date: Tue, 23 Oct 2018 00:37:19 +0200
Subject: [PATCH 1/1] Fix ssh-credentials-id for git-scm

Change-Id: Id0a4aeb73a936f587acbc56962fd1aa028d13ea3
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
---
 jjb/datafile/datafile-verify-jobs.yaml |  2 ++
 jjb/global/jjb-macros.yaml             | 12 ++----------
 jjb/infra/jjb-merge-jobs.yaml          |  2 ++
 jjb/infra/jjb-verify-jobs.yaml         |  2 ++
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/jjb/datafile/datafile-verify-jobs.yaml b/jjb/datafile/datafile-verify-jobs.yaml
index 342a8f89..3a582942 100644
--- a/jjb/datafile/datafile-verify-jobs.yaml
+++ b/jjb/datafile/datafile-verify-jobs.yaml
@@ -12,6 +12,7 @@
     stream:
       - nordix-dev:
           branch: '{stream}'
+          ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
 
     jobs:
       - '{project-name}-{stream}-verify-java'
@@ -50,6 +51,7 @@
 
     scm:
       - git-scm-gerrit:
+          ssh-credentials-id: '{ssh-credentials-id}'
           branch: '{branch}'
           refspec: $GERRIT_REFSPEC
 
diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml
index 78392e76..c8b0b197 100644
--- a/jjb/global/jjb-macros.yaml
+++ b/jjb/global/jjb-macros.yaml
@@ -41,10 +41,6 @@
           name: GIT_BASE_SSH
           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
@@ -61,10 +57,6 @@
           name: GIT_BASE_SSH
           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:
@@ -82,7 +74,7 @@
     scm:
       - git:
           url: '$GIT_BASE_SSH/$PROJECT'
-          credentials-id: '$CREDENTIALS_ID'
+          credentials-id: '{ssh-credentials-id}'
           branches:
             - 'refs/heads/{branch}'
           refspec: '{refspec}'
@@ -101,7 +93,7 @@
     scm:
       - git:
           url: '$GIT_BASE_SSH/$PROJECT'
-          credentials-id: '$CREDENTIALS_ID'
+          credentials-id: '{ssh-credentials-id}'
           branches:
             - 'refs/heads/{branch}'
           refspec: '{refspec}'
diff --git a/jjb/infra/jjb-merge-jobs.yaml b/jjb/infra/jjb-merge-jobs.yaml
index 6505fedb..cbd58155 100644
--- a/jjb/infra/jjb-merge-jobs.yaml
+++ b/jjb/infra/jjb-merge-jobs.yaml
@@ -11,6 +11,7 @@
     stream:
       - master:
           branch: '{stream}'
+          ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
 
     jobs:
       - infra-jjb-merge-{stream}
@@ -34,6 +35,7 @@
 
     scm:
       - git-scm:
+          ssh-credentials-id: '{ssh-credentials-id}'
           branch: '{branch}'
           refspec: ''
 
diff --git a/jjb/infra/jjb-verify-jobs.yaml b/jjb/infra/jjb-verify-jobs.yaml
index 469ad66a..22d81af4 100644
--- a/jjb/infra/jjb-verify-jobs.yaml
+++ b/jjb/infra/jjb-verify-jobs.yaml
@@ -11,6 +11,7 @@
     stream:
       - master:
           branch: '{stream}'
+          ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
 
     jobs:
       - infra-jjb-verify-{stream}
@@ -34,6 +35,7 @@
 
     scm:
       - git-scm-gerrit:
+          ssh-credentials-id: '{ssh-credentials-id}'
           branch: '{branch}'
           refspec: $GERRIT_REFSPEC
 
-- 
2.25.1