- 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>
choosing-strategy: 'gerrit'
wrappers:
choosing-strategy: 'gerrit'
wrappers:
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
triggers:
- gerrit-trigger-patch-submitted:
triggers:
- gerrit-trigger-patch-submitted:
choosing-strategy: 'default'
wrappers:
choosing-strategy: 'default'
wrappers:
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
triggers:
- gerrit-trigger-patch-merged:
triggers:
- gerrit-trigger-patch-merged:
commit: '$ZUUL_COMMIT'
wrappers:
commit: '$ZUUL_COMMIT'
wrappers:
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
commit: 'origin/$ZUUL_BRANCH'
wrappers:
commit: 'origin/$ZUUL_BRANCH'
wrappers:
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
commit: '$ZUUL_COMMIT'
wrappers:
commit: '$ZUUL_COMMIT'
wrappers:
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
commit: 'origin/$ZUUL_BRANCH'
wrappers:
commit: 'origin/$ZUUL_BRANCH'
wrappers:
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
branch: '{branch}'
wrappers:
branch: '{branch}'
wrappers:
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
triggers:
- build-result:
triggers:
- build-result:
choosing-strategy: 'gerrit'
wrappers:
choosing-strategy: 'gerrit'
wrappers:
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
triggers:
- gerrit-trigger-patch-submitted:
triggers:
- gerrit-trigger-patch-submitted:
choosing-strategy: 'gerrit'
wrappers:
choosing-strategy: 'gerrit'
wrappers:
- - timestamps
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
choosing-strategy: 'gerrit'
wrappers:
choosing-strategy: 'gerrit'
wrappers:
- - timestamps
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: 1400
- fdio-infra-wrappers:
build-timeout: 1400
branch: '{branch}'
wrappers:
branch: '{branch}'
wrappers:
- - timestamps
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '480'
- fdio-infra-wrappers:
build-timeout: '480'
branch: '{branch}'
wrappers:
branch: '{branch}'
wrappers:
- - timestamps
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: 480
- fdio-infra-wrappers:
build-timeout: 480
branch: '{branch}'
wrappers:
branch: '{branch}'
wrappers:
- - timestamps
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '1440'
- fdio-infra-wrappers:
build-timeout: '1440'
choosing-strategy: 'gerrit'
wrappers:
choosing-strategy: 'gerrit'
wrappers:
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
choosing-strategy: 'gerrit'
wrappers:
choosing-strategy: 'gerrit'
wrappers:
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
choosing-strategy: 'default'
wrappers:
choosing-strategy: 'default'
wrappers:
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
timeout: '{build-timeout}'
timeout-var: 'BUILD_TIMEOUT'
fail: true
timeout: '{build-timeout}'
timeout-var: 'BUILD_TIMEOUT'
fail: true
+ - timestamps
+ - ssh-agent-credentials:
+ users:
+ - 'jenkins-gerrit-credentials'
- jclouds:
single-use: True
- jclouds:
single-use: True
variable: 'GLOBAL_SETTINGS_FILE'
- file-id: '{settings-file}'
variable: 'SETTINGS_FILE'
variable: 'GLOBAL_SETTINGS_FILE'
- file-id: '{settings-file}'
variable: 'SETTINGS_FILE'
choosing-strategy: 'gerrit'
wrappers:
choosing-strategy: 'gerrit'
wrappers:
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
choosing-strategy: 'gerrit'
wrappers:
choosing-strategy: 'gerrit'
wrappers:
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
choosing-strategy: 'gerrit'
wrappers:
choosing-strategy: 'gerrit'
wrappers:
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
choosing-strategy: 'gerrit'
wrappers:
choosing-strategy: 'gerrit'
wrappers:
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
choosing-strategy: 'default'
wrappers:
choosing-strategy: 'default'
wrappers:
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
choosing-strategy: 'default'
wrappers:
choosing-strategy: 'default'
wrappers:
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
choosing-strategy: 'default'
wrappers:
choosing-strategy: 'default'
wrappers:
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
choosing-strategy: 'default'
wrappers:
choosing-strategy: 'default'
wrappers:
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
global-settings-file: 'global-settings'
- shell:
!include-raw-escape: include-raw-nsh_sfc-docs.sh
global-settings-file: 'global-settings'
- shell:
!include-raw-escape: include-raw-nsh_sfc-docs.sh
choosing-strategy: 'gerrit'
wrappers:
choosing-strategy: 'gerrit'
wrappers:
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
choosing-strategy: 'gerrit'
wrappers:
choosing-strategy: 'gerrit'
wrappers:
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
choosing-strategy: 'default'
wrappers:
choosing-strategy: 'default'
wrappers:
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
choosing-strategy: 'gerrit'
wrappers:
choosing-strategy: 'gerrit'
wrappers:
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
triggers:
- gerrit-trigger-patch-submitted:
triggers:
- gerrit-trigger-patch-submitted:
choosing-strategy: 'gerrit'
wrappers:
choosing-strategy: 'gerrit'
wrappers:
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
choosing-strategy: 'default'
wrappers:
choosing-strategy: 'default'
wrappers:
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
triggers:
- gerrit-trigger-patch-merged:
triggers:
- gerrit-trigger-patch-merged:
- shell:
!include-raw-escape: include-raw-vpp-checkstyle.sh
- shell:
- 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'
choosing-strategy: 'gerrit'
wrappers:
choosing-strategy: 'gerrit'
wrappers:
- - timestamps
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
choosing-strategy: 'gerrit'
wrappers:
choosing-strategy: 'gerrit'
wrappers:
- - timestamps
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
choosing-strategy: 'default'
wrappers:
choosing-strategy: 'default'
wrappers:
- - timestamps
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
choosing-strategy: 'gerrit'
wrappers:
choosing-strategy: 'gerrit'
wrappers:
- - timestamps
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
choosing-strategy: 'gerrit'
wrappers:
choosing-strategy: 'gerrit'
wrappers:
- - timestamps
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
choosing-strategy: 'gerrit'
wrappers:
choosing-strategy: 'gerrit'
wrappers:
- - timestamps
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
choosing-strategy: 'default'
wrappers:
choosing-strategy: 'default'
wrappers:
- - timestamps
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
fingerprint: false
only-if-success: true
default-excludes: false
fingerprint: false
only-if-success: true
default-excludes: false