summaryrefslogtreecommitdiffstats
path: root/jjb/ci-management
diff options
context:
space:
mode:
authorThanh Ha <thanh.ha@linuxfoundation.org>2016-10-14 00:32:00 -0400
committerThanh Ha <thanh.ha@linuxfoundation.org>2016-10-14 00:32:02 -0400
commit61ff560afc8381d983571ad7395c4d9db1ca998f (patch)
tree3aa24a2d7f1906bc6f77c9cf432a9c38e63c2520 /jjb/ci-management
parent4395e4a78efe5318f660394671c53d12a4d1d692 (diff)
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>
Diffstat (limited to 'jjb/ci-management')
-rw-r--r--jjb/ci-management/ci-management-jobs.yaml24
1 files changed, 12 insertions, 12 deletions
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: