summaryrefslogtreecommitdiffstats
path: root/jjb/vpp
diff options
context:
space:
mode:
authorVanessa Rene Valderrama <vvalderrama@linuxfoundation.org>2016-12-15 11:47:01 -0600
committerVanessa Rene Valderrama <vvalderrama@linuxfoundation.org>2016-12-16 16:05:22 -0600
commitf70812d21015a503067ff6f9e2d3a3802dbeac63 (patch)
tree2d56c9a1595a6e8b45f7672fe4bac87ec33557ba /jjb/vpp
parentc71397dcf555583c9dd391d0e10acf976250d151 (diff)
Convert vpp to be Packer compliant
Transition jobs for vpp to be Packer compliant * Modifying vpp build minions to use the new node naming standard * Temporarily using mvn33-new during cutover Change-Id: I1b85371bb5bad151986892d4ac1ee4f7d8196a84 Signed-off-by: Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org>
Diffstat (limited to 'jjb/vpp')
-rw-r--r--jjb/vpp/vpp.yaml28
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