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
Convert vpp to be Packer compliant
[ci-management.git]
/
jjb
/
vpp
/
vpp.yaml
diff --git
a/jjb/vpp/vpp.yaml
b/jjb/vpp/vpp.yaml
index
5df9968
..
730ab84
100644
(file)
--- a/
jjb/vpp/vpp.yaml
+++ b/
jjb/vpp/vpp.yaml
@@
-5,6
+5,7
@@
- 'vpp-merge-{stream}-{os}'
- 'vpp-verify-image-{stream}-{os}'
- 'vpp-docs-merge-{stream}'
- 'vpp-merge-{stream}-{os}'
- 'vpp-verify-image-{stream}-{os}'
- 'vpp-docs-merge-{stream}'
+ - 'vpp-docs-verify-{stream}'
project: 'vpp'
os:
project: 'vpp'
os:
@@
-27,6
+28,9
@@
- '1609':
branch: 'stable/1609'
repo-stream-part: 'stable.1609'
- '1609':
branch: 'stable/1609'
repo-stream-part: 'stable.1609'
+ - '1701':
+ branch: 'stable/1701'
+ repo-stream-part: 'stable.1701'
type:
- short
- long
type:
- short
- long
@@
-50,8
+54,11
@@
- '1609':
branch: 'stable/1609'
repo-stream-part: 'stable.1609'
- '1609':
branch: 'stable/1609'
repo-stream-part: 'stable.1609'
+ - '1701':
+ branch: 'stable/1701'
+ repo-stream-part: 'stable.1609'
- os: ubuntu1
4
04
+ os: ubuntu1
6
04
type:
- all
- short
type:
- all
- short
@@
-61,7
+68,7
@@
name: 'vpp-verify-{stream}-{os}'
project-type: freestyle
name: 'vpp-verify-{stream}-{os}'
project-type: freestyle
- node: '
verify-{os}
'
+ node: '
{os}-basebuild-4c-4g
'
concurrent: true
logrotate:
concurrent: true
logrotate:
@@
-80,14
+87,11
@@
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}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-101,12
+105,19
@@
!include-raw-escape: include-raw-vpp-checkstyle.sh
- shell:
!include-raw-escape: include-raw-vpp-build.sh
!include-raw-escape: include-raw-vpp-checkstyle.sh
- shell:
!include-raw-escape: include-raw-vpp-build.sh
+ publishers:
+ - archive:
+ artifacts: 'build-root/*.rpm,build-root/*.deb'
+ allow-empty: 'true'
+ fingerprint: false
+ only-if-success: true
+ default-excludes: false
- job-template:
name: 'vpp-verify-image-{stream}-{os}'
project-type: freestyle
- job-template:
name: 'vpp-verify-image-{stream}-{os}'
project-type: freestyle
- node: '
verify-image-{os}
'
+ node: '
{os}-basebuild-4c-4g
'
concurrent: true
logrotate:
concurrent: true
logrotate:
@@
-125,14
+136,11
@@
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}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-164,7
+172,7
@@
name: 'vpp-merge-{stream}-{os}'
project-type: freestyle
name: 'vpp-merge-{stream}-{os}'
project-type: freestyle
- node: '
merge-{os}
'
+ node: '
{os}-basebuild-4c-4g
'
logrotate:
daysToKeep: '{build-days-to-keep}'
logrotate:
daysToKeep: '{build-days-to-keep}'
@@
-180,20
+188,19
@@
- os-parameter:
os: '{os}'
- maven-project-parameter:
- os-parameter:
os: '{os}'
- maven-project-parameter:
- maven: '{mvn33}'
+ maven: 'mvn33-new'
+ - maven-exec:
+ maven-version: 'mvn33-new'
- 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}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-208,7
+215,7
@@
- shell:
!include-raw-escape: include-raw-vpp-build.sh
- maven-target:
- shell:
!include-raw-escape: include-raw-vpp-build.sh
- maven-target:
- maven-version: '
{mvn33}
'
+ maven-version: '
mvn33-new
'
goals: '--version'
settings: 'vpp-settings'
settings-type: cfp
goals: '--version'
settings: 'vpp-settings'
settings-type: cfp
@@
-218,7
+225,9
@@
settings-file: 'vpp-settings'
global-settings-file: 'global-settings'
- shell:
settings-file: 'vpp-settings'
global-settings-file: 'global-settings'
- shell:
- !include-raw-escape: include-raw-vpp-maven-push.sh
+ !include-raw-escape:
+ - ../scripts/maven_push_functions.sh
+ - include-raw-vpp-maven-push.sh
publishers:
- archive:
artifacts: 'build-root/*.rpm,build-root/*.deb'
publishers:
- archive:
artifacts: 'build-root/*.rpm,build-root/*.deb'
@@
-231,7
+240,7
@@
name: 'vpp-csit-verify-virl-{stream}'
project-type: freestyle
name: 'vpp-csit-verify-virl-{stream}'
project-type: freestyle
- node: '
verify-{os}
'
+ node: '
{os}-basebuild-4c-4g
'
concurrent: true
logrotate:
concurrent: true
logrotate:
@@
-247,18
+256,16
@@
branch: '{branch}'
- os-parameter:
os: '{os}'
branch: '{branch}'
- os-parameter:
os: '{os}'
+ - is-csit-vpp-job-parameter:
+ is-csit-vpp-job: 'True'
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:
- - timestamps
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@
-287,7
+294,7
@@
name: 'vpp-csit-verify-hw-perf-{stream}-{type}'
project-type: freestyle
name: 'vpp-csit-verify-hw-perf-{stream}-{type}'
project-type: freestyle
- node: '
verify-{os}
'
+ node: '
{os}-basebuild-4c-4g
'
concurrent: false
logrotate:
concurrent: false
logrotate:
@@
-305,20
+312,18
@@
os: '{os}'
- type-parameter:
type: '{type}'
os: '{os}'
- type-parameter:
type: '{type}'
+ - is-csit-vpp-job-parameter:
+ is-csit-vpp-job: 'True'
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:
- - timestamps
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
- - fdio-infra-wrappers:
- build-timeout: '{build-timeout}'
+ - fdio-infra-wrappers-non-activity-timeout:
+ build-timeout: 30
triggers:
- gerrit-trigger-manually-triggered:
triggers:
- gerrit-trigger-manually-triggered:
@@
-353,7
+358,7
@@
name: 'vpp-docs-verify-{stream}'
project-type: freestyle
name: 'vpp-docs-verify-{stream}'
project-type: freestyle
- node:
'verify-ubuntu1604'
+ node:
ubuntu1604-basebuild-4c-4g
concurrent: true
logrotate:
concurrent: true
logrotate:
@@
-369,17
+374,18
@@
branch: '{branch}'
- os-parameter:
os: 'ubuntu1604'
branch: '{branch}'
- os-parameter:
os: 'ubuntu1604'
+ - maven-exec:
+ maven-version: 'mvn33-new'
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
- credentials-id: '
{ssh-credentials}
'
- refspec: ''
- choosing-strategy: '
defaul
t'
+ credentials-id: '
jenkins-gerrit-credentials
'
+ refspec: '
$GERRIT_REFSPEC
'
+ choosing-strategy: '
gerri
t'
wrappers:
wrappers:
- - ssh-agent-credentials:
- users:
- - '{ssh-credentials}'
+ - fdio-infra-wrappers:
+ build-timeout: '{build-timeout}'
triggers:
- gerrit-trigger-patch-submitted:
triggers:
- gerrit-trigger-patch-submitted:
@@
-388,7
+394,7
@@
builders:
- maven-target:
builders:
- maven-target:
- maven-version: '
{mvn33}
'
+ maven-version: '
mvn33-new
'
goals: '--version'
settings: 'vpp-settings'
settings-type: cfp
goals: '--version'
settings: 'vpp-settings'
settings-type: cfp
@@
-411,7
+417,7
@@
name: 'vpp-docs-merge-{stream}'
project-type: freestyle
name: 'vpp-docs-merge-{stream}'
project-type: freestyle
- node:
'verify-ubuntu1604'
+ node:
ubuntu1604-basebuild-4c-4g
concurrent: true
logrotate:
concurrent: true
logrotate:
@@
-427,17
+433,18
@@
branch: '{branch}'
- os-parameter:
os: 'ubuntu1604'
branch: '{branch}'
- os-parameter:
os: 'ubuntu1604'
+ - maven-exec:
+ maven-version: 'mvn33-new'
scm:
- gerrit-trigger-scm:
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:
- reverse:
triggers:
- reverse:
@@
-462,7
+469,7
@@
builders:
- maven-target:
builders:
- maven-target:
- maven-version: '
{mvn33}
'
+ maven-version: '
mvn33-new
'
goals: '--version'
settings: 'vpp-settings'
settings-type: cfp
goals: '--version'
settings: 'vpp-settings'
settings-type: cfp
@@
-480,4
+487,3
@@
fingerprint: false
only-if-success: true
default-excludes: false
fingerprint: false
only-if-success: true
default-excludes: false
-