Move ssh-credentials-id into git-scm

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

diff --git a/jjb/datafile/datafile-verify-jobs.yaml b/jjb/datafile/datafile-verify-jobs.yaml
index 3a5829429bb871eb6eb69d59981e3628752ca058..24fa677cb9dc98df0d73e7eb1f2fc77627dda72e 100644 (file)
--- a/jjb/datafile/datafile-verify-jobs.yaml
+++ b/jjb/datafile/datafile-verify-jobs.yaml
@@ -12,7 +12,6 @@
     stream:
       - nordix-dev:
           branch: '{stream}'
-          ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
 
     jobs:
       - '{project-name}-{stream}-verify-java'
@@ -51,7 +50,7 @@
 
     scm:
       - git-scm-gerrit:
-          ssh-credentials-id: '{ssh-credentials-id}'
+          ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
           branch: '{branch}'
           refspec: $GERRIT_REFSPEC
 

diff --git a/jjb/infra/jjb-merge-jobs.yaml b/jjb/infra/jjb-merge-jobs.yaml
index cbd58155d5beb5636eb42377bb8d8b857ecca5cc..ccbaf6b2d4c66a43b180e63a4e08eb9c09290315 100644 (file)
--- a/jjb/infra/jjb-merge-jobs.yaml
+++ b/jjb/infra/jjb-merge-jobs.yaml
@@ -11,7 +11,6 @@
     stream:
       - master:
           branch: '{stream}'
-          ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
 
     jobs:
       - infra-jjb-merge-{stream}
@@ -35,7 +34,7 @@
 
     scm:
       - git-scm:
-          ssh-credentials-id: '{ssh-credentials-id}'
+          ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
           branch: '{branch}'
           refspec: ''
 

diff --git a/jjb/infra/jjb-verify-jobs.yaml b/jjb/infra/jjb-verify-jobs.yaml
index 22d81af46edf0ff028f8897e44f07948ae5a6ef8..2d2a3605c8ef152f4d96576755bde0faef1b3e67 100644 (file)
--- a/jjb/infra/jjb-verify-jobs.yaml
+++ b/jjb/infra/jjb-verify-jobs.yaml
@@ -11,7 +11,6 @@
     stream:
       - master:
           branch: '{stream}'
-          ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
 
     jobs:
       - infra-jjb-verify-{stream}
@@ -35,7 +34,7 @@
 
     scm:
       - git-scm-gerrit:
-          ssh-credentials-id: '{ssh-credentials-id}'
+          ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
           branch: '{branch}'
           refspec: $GERRIT_REFSPEC