From 61ff560afc8381d983571ad7395c4d9db1ca998f Mon Sep 17 00:00:00 2001 From: Thanh Ha 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 --- jjb/tldk/tldk.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'jjb/tldk') diff --git a/jjb/tldk/tldk.yaml b/jjb/tldk/tldk.yaml index 0ee380686..83cfbf4af 100644 --- a/jjb/tldk/tldk.yaml +++ b/jjb/tldk/tldk.yaml @@ -37,14 +37,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' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -80,14 +80,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' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -135,14 +135,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' - fdio-infra-wrappers: build-timeout: '{build-timeout}' -- cgit 1.2.3-korg