diff options
| author |   Thanh Ha <thanh.ha@linuxfoundation.org> | 2016-10-14 00:32:00 -0400 |
|---|---|---|
| committer | Thanh Ha <thanh.ha@linuxfoundation.org> | 2016-10-14 00:32:02 -0400 |
| commit | 61ff560afc8381d983571ad7395c4d9db1ca998f (patch) | |
| tree | 3aa24a2d7f1906bc6f77c9cf432a9c38e63c2520 /jjb/vpp | |
| parent | 4395e4a78efe5318f660394671c53d12a4d1d692 (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/vpp')
| -rw-r--r-- | jjb/vpp/vpp-lite.yaml | 12 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 28 |
2 files changed, 20 insertions, 20 deletions
diff --git a/jjb/vpp/vpp-lite.yaml b/jjb/vpp/vpp-lite.yaml index 49d807cc4..6574f5310 100644 --- a/jjb/vpp/vpp-lite.yaml +++ b/jjb/vpp/vpp-lite.yaml @@ -53,14 +53,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: @@ -96,14 +96,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: @@ -155,14 +155,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: diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 85382ade6..587b68543 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -81,7 +81,7 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' @@ -89,7 +89,7 @@ - timestamps - ssh-agent-credentials: users: - - '{ssh-credentials}' + - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -134,7 +134,7 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' @@ -142,7 +142,7 @@ - timestamps - ssh-agent-credentials: users: - - '{ssh-credentials}' + - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -196,7 +196,7 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '' choosing-strategy: 'default' @@ -204,7 +204,7 @@ - timestamps - ssh-agent-credentials: users: - - '{ssh-credentials}' + - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -263,7 +263,7 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' @@ -271,7 +271,7 @@ - timestamps - ssh-agent-credentials: users: - - '{ssh-credentials}' + - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -321,7 +321,7 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' @@ -329,7 +329,7 @@ - timestamps - ssh-agent-credentials: users: - - '{ssh-credentials}' + - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -385,7 +385,7 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' @@ -393,7 +393,7 @@ - timestamps - ssh-agent-credentials: users: - - '{ssh-credentials}' + - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -446,7 +446,7 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '' choosing-strategy: 'default' @@ -454,7 +454,7 @@ - timestamps - ssh-agent-credentials: users: - - '{ssh-credentials}' + - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' |