From 61ff560afc8381d983571ad7395c4d9db1ca998f Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Fri, 14 Oct 2016 00:32:00 -0400 Subject: [PATCH] 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/ci-management/ci-management-jobs.yaml | 24 ++++++++++++------------ jjb/csit/csit-vpp-honeycomb.yaml | 2 +- jjb/csit/csit-vpp-pylint.yaml | 4 ++-- jjb/csit/csit.yaml | 16 ++++++++-------- jjb/deb_dpdk/deb_dpdk.yaml | 12 ++++++------ jjb/global-defaults.yaml | 3 --- jjb/honeycomb/honeycomb.yaml | 16 ++++++++-------- jjb/nsh_sfc/nsh_sfc.yaml | 24 ++++++++++++------------ jjb/tldk/tldk.yaml | 12 ++++++------ jjb/vpp/vpp-lite.yaml | 12 ++++++------ jjb/vpp/vpp.yaml | 28 ++++++++++++++-------------- 11 files changed, 75 insertions(+), 78 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: diff --git a/jjb/csit/csit-vpp-honeycomb.yaml b/jjb/csit/csit-vpp-honeycomb.yaml index 6d11904b6..01235dfb3 100644 --- a/jjb/csit/csit-vpp-honeycomb.yaml +++ b/jjb/csit/csit-vpp-honeycomb.yaml @@ -36,7 +36,7 @@ wrappers: - ssh-agent-credentials: users: - - '{ssh-credentials}' + - 'jenkins-gerrit-credentials' triggers: - build-result: diff --git a/jjb/csit/csit-vpp-pylint.yaml b/jjb/csit/csit-vpp-pylint.yaml index 12e581c41..03de48d4f 100644 --- a/jjb/csit/csit-vpp-pylint.yaml +++ b/jjb/csit/csit-vpp-pylint.yaml @@ -35,14 +35,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: diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index c9a0d58e4..0abd0cc59 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -52,7 +52,7 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' @@ -60,7 +60,7 @@ - timestamps - ssh-agent-credentials: users: - - '{ssh-credentials}' + - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -104,7 +104,7 @@ scm: - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' @@ -112,7 +112,7 @@ - timestamps - ssh-agent-credentials: users: - - '{ssh-credentials}' + - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: 1400 @@ -290,14 +290,14 @@ scm: - git-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' branch: '{branch}' wrappers: - timestamps - ssh-agent-credentials: users: - - '{ssh-credentials}' + - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '480' @@ -355,7 +355,7 @@ - timestamps - ssh-agent-credentials: users: - - '{ssh-credentials}' + - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: 480 @@ -406,7 +406,7 @@ - timestamps - ssh-agent-credentials: users: - - '{ssh-credentials}' + - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '1440' diff --git a/jjb/deb_dpdk/deb_dpdk.yaml b/jjb/deb_dpdk/deb_dpdk.yaml index d7f9384ee..8bf820482 100644 --- a/jjb/deb_dpdk/deb_dpdk.yaml +++ b/jjb/deb_dpdk/deb_dpdk.yaml @@ -44,14 +44,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}' @@ -90,14 +90,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}' @@ -148,14 +148,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}' diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml index 96946b419..b5aa1009f 100644 --- a/jjb/global-defaults.yaml +++ b/jjb/global-defaults.yaml @@ -9,6 +9,3 @@ build-artifact-num-to-keep: 5 # Timeout in minutes build-timeout: 360 - - ssh-credentials: 'jenkins-gerrit-credentials' - diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml index beaacc29f..7247ce2b9 100644 --- a/jjb/honeycomb/honeycomb.yaml +++ b/jjb/honeycomb/honeycomb.yaml @@ -43,14 +43,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}' @@ -98,14 +98,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}' @@ -168,14 +168,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}' @@ -228,14 +228,14 @@ scm: - git-scm: - credentials-id: '{ssh-credentials}' + credentials-id: 'jenkins-gerrit-credentials' refspec: '' branch: '{branch}' wrappers: - ssh-agent-credentials: users: - - '{ssh-credentials}' + - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' diff --git a/jjb/nsh_sfc/nsh_sfc.yaml b/jjb/nsh_sfc/nsh_sfc.yaml index f81246221..10991c770 100644 --- a/jjb/nsh_sfc/nsh_sfc.yaml +++ b/jjb/nsh_sfc/nsh_sfc.yaml @@ -49,14 +49,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}' @@ -115,14 +115,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}' @@ -193,14 +193,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}' @@ -251,14 +251,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}' @@ -310,14 +310,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}' @@ -366,14 +366,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}' 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}' 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}' -- 2.16.6