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
Merge "Convert tldk to be Packer compliant"
[ci-management.git]
/
jjb
/
vpp
/
vpp.yaml
diff --git
a/jjb/vpp/vpp.yaml
b/jjb/vpp/vpp.yaml
index
77ff353
..
730ab84
100644
(file)
--- a/
jjb/vpp/vpp.yaml
+++ b/
jjb/vpp/vpp.yaml
@@
-68,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:
@@
-117,7
+117,7
@@
name: 'vpp-verify-image-{stream}-{os}'
project-type: freestyle
name: 'vpp-verify-image-{stream}-{os}'
project-type: freestyle
- node: '
verify-image-{os}
'
+ node: '
{os}-basebuild-4c-4g
'
concurrent: true
logrotate:
concurrent: true
logrotate:
@@
-172,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}'
@@
-188,7
+188,9
@@
- 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}'
- repo-name-parameter:
repo-name: '{repo-stream-part}.{repo-os-part}'
@@
-213,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
@@
-238,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:
@@
-254,6
+256,8
@@
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:
@@
-290,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:
@@
-308,6
+312,8
@@
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:
@@
-352,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:
@@
-368,6
+374,8
@@
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:
@@
-386,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
@@
-409,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:
@@
-425,6
+433,8
@@
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:
@@
-459,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