summaryrefslogtreecommitdiffstats
path: root/jjb/honeycomb
diff options
context:
space:
mode:
authorThanh Ha <thanh.ha@linuxfoundation.org>2016-12-19 21:42:30 +0000
committerGerrit Code Review <gerrit@fd.io>2016-12-19 21:42:30 +0000
commitfc9365863409fb0cf0a78d839f1e7f7d044ec483 (patch)
tree4e44acf20b0467fdc73f213c9a4a160a8c9ab9a8 /jjb/honeycomb
parent2db832610b79829c35de561726de8ed9cf03d2b5 (diff)
parent08cc9f170b4283b1d339d5ea45bd72b252125a6f (diff)
Merge "Convert honeycomb to be Packer compliant"
Diffstat (limited to 'jjb/honeycomb')
-rw-r--r--jjb/honeycomb/honeycomb.yaml22
1 files changed, 13 insertions, 9 deletions
diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index 9662b5b01..c3ff0c5ea 100644
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -20,7 +20,7 @@
- job-template:
name: 'honeycomb-verify-{stream}-{os}'
project-type: maven
- node: verify-{os}
+ node: '{os}-basebuild-4c-4g'
concurrent: true
jdk: openjdk8-{os}
@@ -57,7 +57,7 @@
- shell: |
if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi
maven:
- maven-name: 'mvn33'
+ maven-name: 'mvn33-new'
root-pom: 'pom.xml'
goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge site'
maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -73,7 +73,7 @@
- job-template:
name: 'honeycomb-merge-{stream}-{os}'
project-type: maven
- node: merge-{os}
+ node: '{os}-basebuild-4c-4g'
jdk: openjdk8-{os}
logrotate:
@@ -88,7 +88,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}'
@@ -111,7 +113,7 @@
branch: '{branch}'
maven:
- maven-name: 'mvn33'
+ maven-name: 'mvn33-new'
root-pom: 'pom.xml'
goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Dsonar -Dmaven.site.skip={skip-site} site -Dmaven.site.deploy.skip={skip-site} site:deploy'
maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
@@ -122,7 +124,7 @@
postbuilders:
- maven-target:
- maven-version: 'mvn33'
+ maven-version: 'mvn33-new'
goals: '--version'
settings: 'honeycomb-settings'
settings-type: cfp
@@ -150,7 +152,7 @@
- job-template:
name: 'honeycomb-benchmark-master'
project-type: maven
- node: verify-ubuntu1604
+ node: ubuntu1604-basebuild-4c-4g
jdk: openjdk8-ubuntu1604
logrotate:
@@ -165,7 +167,9 @@
- os-parameter:
os: 'ubuntu1604'
- maven-project-parameter:
- maven: 'mvn33'
+ maven: 'mvn33-new'
+ - maven-exec:
+ maven-version: 'mvn33-new'
- repo-name-parameter:
repo-name: 'master.ubuntu.xenial.main'
@@ -185,7 +189,7 @@
- timed: '@daily'
maven:
- maven-name: 'mvn33'
+ maven-name: 'mvn33-new'
root-pom: 'pom.xml'
goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Pbenchmark'
maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'