From 61ff560afc8381d983571ad7395c4d9db1ca998f Mon Sep 17 00:00:00 2001
From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Fri, 14 Oct 2016 00:32:00 -0400
Subject: Remove unnecessary ssh-credentials defaults

ODL used to use a variable called {ssh-credentials} as a form of
redirection in order to have a simple human readable word to represent a
unique credentials id in Jenkins. Newer versions of Jenkins actually
allows us to override the credentials-id UUID format and pass a human
readable filename.

Considering that FD.io has been using a human readable
jenkins-gerrit-credentials credentials-id remove the unnecessary
{ssh-credentials} id defaults from global-defaults and just access the
credential directly.

Change-Id: I7b59357dcacb2195646719709b3b623429deca91
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---
 jjb/ci-management/ci-management-jobs.yaml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'jjb/ci-management/ci-management-jobs.yaml')

diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml
index fbce13ff2..559a739b9 100644
--- a/jjb/ci-management/ci-management-jobs.yaml
+++ b/jjb/ci-management/ci-management-jobs.yaml
@@ -26,14 +26,14 @@
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
     wrappers:
         - ssh-agent-credentials:
             users:
-                - '{ssh-credentials}'
+                - 'jenkins-gerrit-credentials'
 
     triggers:
         - gerrit-trigger-patch-submitted:
@@ -67,14 +67,14 @@
 
     scm:
         - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: ''
             choosing-strategy: 'default'
 
     wrappers:
         - ssh-agent-credentials:
             users:
-                - '{ssh-credentials}'
+                - 'jenkins-gerrit-credentials'
 
     triggers:
         - gerrit-trigger-patch-merged:
@@ -100,14 +100,14 @@
 
     scm:
         - zuul-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: '$ZUUL_REF'
             commit: '$ZUUL_COMMIT'
 
     wrappers:
         - ssh-agent-credentials:
             users:
-                - '{ssh-credentials}'
+                - 'jenkins-gerrit-credentials'
 
     builders:
         - shell:
@@ -127,14 +127,14 @@
 
     scm:
         - zuul-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: ''
             commit: 'origin/$ZUUL_BRANCH'
 
     wrappers:
         - ssh-agent-credentials:
             users:
-                - '{ssh-credentials}'
+                - 'jenkins-gerrit-credentials'
 
     builders:
         - shell:
@@ -157,14 +157,14 @@
 
     scm:
         - zuul-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: '$ZUUL_REF'
             commit: '$ZUUL_COMMIT'
 
     wrappers:
         - ssh-agent-credentials:
             users:
-                - '{ssh-credentials}'
+                - 'jenkins-gerrit-credentials'
 
     builders:
         - shell:
@@ -184,14 +184,14 @@
 
     scm:
         - zuul-trigger-scm:
-            credentials-id: '{ssh-credentials}'
+            credentials-id: 'jenkins-gerrit-credentials'
             refspec: ''
             commit: 'origin/$ZUUL_BRANCH'
 
     wrappers:
         - ssh-agent-credentials:
             users:
-                - '{ssh-credentials}'
+                - 'jenkins-gerrit-credentials'
 
     builders:
         - shell:
-- 
cgit 1.2.3-korg