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
Modify OS syntax
[ci-management.git]
/
jjb
/
honeycomb
/
honeycomb.yaml
diff --git
a/jjb/honeycomb/honeycomb.yaml
b/jjb/honeycomb/honeycomb.yaml
index
5f53c7a
..
d1e0cde
100644
(file)
--- a/
jjb/honeycomb/honeycomb.yaml
+++ b/
jjb/honeycomb/honeycomb.yaml
@@
-1,3
+1,4
@@
+---
- project:
name: honeycomb
jobs:
- project:
name: honeycomb
jobs:
@@
-5,20
+6,22
@@
- 'honeycomb-merge-{stream}-{os}'
- 'honeycomb-benchmark-master'
project: 'honeycomb'
- 'honeycomb-merge-{stream}-{os}'
- 'honeycomb-benchmark-master'
project: 'honeycomb'
- os:
- - ubuntu1604:
- repo-os-part: 'ubuntu.xenial.main'
- skip-site: 'true'
+ os: 'ubuntu1604'
+ repo-os-part: 'ubuntu.xenial.main'
+
stream:
- master:
branch: 'master'
repo-stream-part: 'master'
stream:
- master:
branch: 'master'
repo-stream-part: 'master'
- - '1609':
- branch: 'stable/1609'
- repo-stream-part: 'stable.1609'
- - '1701':
- branch: 'stable/1701'
- repo-stream-part: 'stable.1701'
+ - '1801':
+ branch: 'stable/1801'
+ repo-stream-part: 'stable.1801'
+ - '1804':
+ branch: 'stable/1804'
+ repo-stream-part: 'stable.1804'
+ - '1807':
+ branch: 'stable/1807'
+ repo-stream-part: 'stable.1807'
- job-template:
name: 'honeycomb-verify-{stream}-{os}'
- job-template:
name: 'honeycomb-verify-{stream}-{os}'
@@
-56,9
+59,6
@@
name: 'honeycomb'
branch: '{branch}'
name: 'honeycomb'
branch: '{branch}'
- prebuilders:
- - 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-new'
root-pom: 'pom.xml'
maven:
maven-name: 'mvn33-new'
root-pom: 'pom.xml'
@@
-120,7
+120,7
@@
maven:
maven-name: 'mvn33-new'
root-pom: 'pom.xml'
maven:
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'
+ goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmerge -Dsonar
site
site:deploy'
maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
settings: 'honeycomb-settings'
settings-type: cfp
maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
settings: 'honeycomb-settings'
settings-type: cfp