diff options
| author |   Thanh Ha <thanh.ha@linuxfoundation.org> | 2016-12-19 21:41:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2016-12-19 21:41:57 +0000 |
| commit | 2db832610b79829c35de561726de8ed9cf03d2b5 (patch) | |
| tree | dcd3f0731d27c85fb0c532ea0e3d9be1bc46142c /jjb | |
| parent | 936f5aeeff5bd25d8e5958a11a97135baaf294d5 (diff) | |
| parent | f70812d21015a503067ff6f9e2d3a3802dbeac63 (diff) | |
Merge "Convert vpp to be Packer compliant"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/vpp/vpp.yaml | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index a47f8b1f5..730ab847d 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -68,7 +68,7 @@ name: 'vpp-verify-{stream}-{os}' project-type: freestyle - node: 'verify-{os}' + node: '{os}-basebuild-4c-4g' concurrent: true logrotate: @@ -117,7 +117,7 @@ name: 'vpp-verify-image-{stream}-{os}' project-type: freestyle - node: 'verify-image-{os}' + node: '{os}-basebuild-4c-4g' concurrent: true logrotate: @@ -172,7 +172,7 @@ name: 'vpp-merge-{stream}-{os}' project-type: freestyle - node: 'merge-{os}' + node: '{os}-basebuild-4c-4g' logrotate: daysToKeep: '{build-days-to-keep}' @@ -188,7 +188,9 @@ - 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}' @@ -213,7 +215,7 @@ - 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 @@ -238,7 +240,7 @@ name: 'vpp-csit-verify-virl-{stream}' project-type: freestyle - node: 'verify-{os}' + node: '{os}-basebuild-4c-4g' concurrent: true logrotate: @@ -292,7 +294,7 @@ name: 'vpp-csit-verify-hw-perf-{stream}-{type}' project-type: freestyle - node: 'verify-{os}' + node: '{os}-basebuild-4c-4g' concurrent: false logrotate: @@ -356,7 +358,7 @@ name: 'vpp-docs-verify-{stream}' project-type: freestyle - node: 'verify-ubuntu1604' + node: ubuntu1604-basebuild-4c-4g concurrent: true logrotate: @@ -372,6 +374,8 @@ branch: '{branch}' - os-parameter: os: 'ubuntu1604' + - maven-exec: + maven-version: 'mvn33-new' scm: - gerrit-trigger-scm: @@ -390,7 +394,7 @@ builders: - maven-target: - maven-version: 'mvn33' + maven-version: 'mvn33-new' goals: '--version' settings: 'vpp-settings' settings-type: cfp @@ -413,7 +417,7 @@ name: 'vpp-docs-merge-{stream}' project-type: freestyle - node: 'verify-ubuntu1604' + node: ubuntu1604-basebuild-4c-4g concurrent: true logrotate: @@ -429,6 +433,8 @@ branch: '{branch}' - os-parameter: os: 'ubuntu1604' + - maven-exec: + maven-version: 'mvn33-new' scm: - gerrit-trigger-scm: @@ -463,7 +469,7 @@ builders: - maven-target: - maven-version: 'mvn33' + maven-version: 'mvn33-new' goals: '--version' settings: 'vpp-settings' settings-type: cfp |