diff options
author | 2016-10-14 00:39:37 -0400 | |
---|---|---|
committer | 2016-10-14 00:51:17 -0400 | |
commit | 21316a6aa857071e89e4d512613a785eddac2ae5 (patch) | |
tree | 0812243ad2b1e7025359e2b4ad88d5364e52cd92 /jjb/vpp | |
parent | 61ff560afc8381d983571ad7395c4d9db1ca998f (diff) |
Use fdio-infra-wrappers to simplify common wrapper use
- Move timestamps to fdio-infra-wrappers as every job is using it
- Move ssh-credentials into fdio-infra-wrappers as every job is using it
- Ensuer ALL jobs are using fdio-infra-wrappers (this should be policy!)
FD.io has this convenient wrapper called fdio-infra-wrappers which is a
simple macro to configure common wrapper functionality that all jobs
should be configured with all jobs are already configuring it too so
simplify job configuration and ensuring we don't have duplication
everywhere.
Less lines of code and more code reuse makes for easier maintenance :)
Change-Id: Ia73b09dfc556f684c43853797231da84a9c517af
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Diffstat (limited to 'jjb/vpp')
-rw-r--r-- | jjb/vpp/vpp-lite.yaml | 17 | ||||
-rw-r--r-- | jjb/vpp/vpp.yaml | 29 |
2 files changed, 7 insertions, 39 deletions
diff --git a/jjb/vpp/vpp-lite.yaml b/jjb/vpp/vpp-lite.yaml index 6574f5310..7f55c8a22 100644 --- a/jjb/vpp/vpp-lite.yaml +++ b/jjb/vpp/vpp-lite.yaml @@ -58,9 +58,8 @@ choosing-strategy: 'gerrit' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' triggers: - gerrit-trigger-patch-submitted: @@ -101,9 +100,8 @@ choosing-strategy: 'gerrit' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' triggers: - gerrit: @@ -160,9 +158,8 @@ choosing-strategy: 'default' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' triggers: - gerrit-trigger-patch-merged: @@ -173,4 +170,4 @@ - shell: !include-raw-escape: include-raw-vpp-checkstyle.sh - shell: - !include-raw-escape: 'include-raw-vpp-lite-build.sh'
\ No newline at end of file + !include-raw-escape: 'include-raw-vpp-lite-build.sh' diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 587b68543..86f8efc94 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -86,10 +86,6 @@ choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -139,10 +135,6 @@ choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -201,10 +193,6 @@ choosing-strategy: 'default' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -268,10 +256,6 @@ choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -326,10 +310,6 @@ choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -390,10 +370,6 @@ choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -451,10 +427,6 @@ choosing-strategy: 'default' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -499,4 +471,3 @@ fingerprint: false only-if-success: true default-excludes: false - |