Code Review
/
ci-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Use fdio-infra-wrappers to simplify common wrapper use
[ci-management.git]
/
jjb
/
vpp
/
vpp-lite.yaml
diff --git
a/jjb/vpp/vpp-lite.yaml
b/jjb/vpp/vpp-lite.yaml
index
ce87719
..
7f55c8a
100644
(file)
--- a/
jjb/vpp/vpp-lite.yaml
+++ b/
jjb/vpp/vpp-lite.yaml
@@
-23,6
+23,9
@@
- '1606':
branch: 'stable/1606'
repo-stream-part: 'stable.1606'
- '1606':
branch: 'stable/1606'
repo-stream-part: 'stable.1606'
+ - '1609':
+ branch: 'stable/1609'
+ repo-stream-part: 'stable.1609'
type:
- short
- long
type:
- short
- long
@@
-50,14
+53,13
@@
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
wrappers:
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
triggers:
- gerrit-trigger-patch-submitted:
triggers:
- gerrit-trigger-patch-submitted:
@@
-65,6
+67,8
@@
branch: '{branch}'
builders:
branch: '{branch}'
builders:
+ - shell:
+ !include-raw-escape: include-raw-vpp-checkstyle.sh
- shell:
!include-raw-escape: 'include-raw-vpp-lite-build.sh'
- shell:
!include-raw-escape: 'include-raw-vpp-lite-build.sh'
@@
-91,14
+95,13
@@
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
wrappers:
refspec: '$GERRIT_REFSPEC'
choosing-strategy: 'gerrit'
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
triggers:
- gerrit:
triggers:
- gerrit:
@@
-119,6
+122,8
@@
notbuilt: true
builders:
notbuilt: true
builders:
+ - shell:
+ !include-raw-escape: include-raw-vpp-checkstyle.sh
- shell:
!include-raw-escape: 'include-raw-vpp-lite-build.sh'
- shell:
!include-raw-escape: 'include-raw-vpp-lite-build.sh'
@@
-142,20
+147,19
@@
- os-parameter:
os: '{os}'
- maven-project-parameter:
- os-parameter:
os: '{os}'
- maven-project-parameter:
- maven: '
{mvn33}
'
+ maven: '
mvn33
'
- repo-name-parameter:
repo-name: '{repo-stream-part}.{repo-os-part}'
scm:
- gerrit-trigger-scm:
- repo-name-parameter:
repo-name: '{repo-stream-part}.{repo-os-part}'
scm:
- gerrit-trigger-scm:
- credentials-id: '
{ssh-credentials}
'
+ credentials-id: '
jenkins-gerrit-credentials
'
refspec: ''
choosing-strategy: 'default'
wrappers:
refspec: ''
choosing-strategy: 'default'
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
triggers:
- gerrit-trigger-patch-merged:
triggers:
- gerrit-trigger-patch-merged:
@@
-164,4
+168,6
@@
builders:
- shell:
builders:
- shell:
- !include-raw-escape: 'include-raw-vpp-lite-build.sh'
\ No newline at end of file
+ !include-raw-escape: include-raw-vpp-checkstyle.sh
+ - shell:
+ !include-raw-escape: 'include-raw-vpp-lite-build.sh'