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
Fix for java home for honeycomb
[ci-management.git]
/
jjb
/
honeycomb
/
honeycomb.yaml
diff --git
a/jjb/honeycomb/honeycomb.yaml
b/jjb/honeycomb/honeycomb.yaml
index
0eb94c4
..
e109734
100644
(file)
--- a/
jjb/honeycomb/honeycomb.yaml
+++ b/
jjb/honeycomb/honeycomb.yaml
@@
-1,14
+1,15
@@
- project:
name: honeycomb
jobs:
- project:
name: honeycomb
jobs:
- - 'honeycomb-verify'
- - 'honeycomb-merge'
- - 'honeycomb-integration'
+ - 'honeycomb-verify
-{branch}-{os}
'
+ - 'honeycomb-merge
-{branch}-{os}
'
+ - 'honeycomb-integration
-{branch}-{os}
'
project: 'honeycomb'
branch: 'master'
project: 'honeycomb'
branch: 'master'
+ os: 'ubuntu1404'
- job-template:
- job-template:
- name: 'honeycomb-verify'
+ name: 'honeycomb-verify
-{branch}-{os}
'
project-type: maven
node: verify
concurrent: true
project-type: maven
node: verify
concurrent: true
@@
-24,6
+25,8
@@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
+ - os-parameter:
+ os: '{os}'
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
@@
-42,6
+45,9
@@
name: 'honeycomb'
branch: '{branch}'
name: 'honeycomb'
branch: '{branch}'
+ prebuilders:
+ - shell: |
+ if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives /usr/lib/jvm/java-1.8.0-openjdk-amd64;fi
maven:
maven-name: '{mvn33}'
root-pom: 'pom.xml'
maven:
maven-name: '{mvn33}'
root-pom: 'pom.xml'
@@
-50,12
+56,16
@@
settings: '{honeycomb-settings}'
global-settings: '{global-settings}'
settings: '{honeycomb-settings}'
global-settings: '{global-settings}'
+ postbuilders:
+ - shell: |
+ if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives /usr/lib/jvm/java-1.7.0-openjdk-amd64;fi
+
publishers:
- email-notification:
email-prefix: '[honeycomb]'
- job-template:
publishers:
- email-notification:
email-prefix: '[honeycomb]'
- job-template:
- name: 'honeycomb-merge'
+ name: 'honeycomb-merge
-{branch}-{os}
'
project-type: maven
node: merge
jdk: '{jdk}'
project-type: maven
node: merge
jdk: '{jdk}'
@@
-69,6
+79,8
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
+ - os-parameter:
+ os: '{os}'
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
@@
-87,6
+99,10
@@
name: 'honeycomb'
branch: '{branch}'
name: 'honeycomb'
branch: '{branch}'
+ prebuilders:
+ - shell: |
+ if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives /usr/lib/jvm/java-1.8.0-openjdk-amd64;fi
+
maven:
maven-name: '{mvn33}'
root-pom: 'pom.xml'
maven:
maven-name: '{mvn33}'
root-pom: 'pom.xml'
@@
-95,6
+111,10
@@
settings: '{honeycomb-settings}'
global-settings: '{global-settings}'
settings: '{honeycomb-settings}'
global-settings: '{global-settings}'
+ postbuilders:
+ - shell: |
+ if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives /usr/lib/jvm/java-1.7.0-openjdk-amd64;fi
+
reporters:
- findbugs
reporters:
- findbugs
@@
-107,7
+127,7
@@
deploy-unstable: false
- job-template:
deploy-unstable: false
- job-template:
- name: 'honeycomb-integration'
+ name: 'honeycomb-integration
-{branch}-{os}
'
project-type: maven
node: merge
jdk: '{jdk}'
project-type: maven
node: merge
jdk: '{jdk}'
@@
-121,6
+141,8
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
+ - os-parameter:
+ os: '{os}'
scm:
- git-scm:
scm:
- git-scm:
@@
-139,6
+161,10
@@
jobs: 'vpp-merge'
result: 'success'
jobs: 'vpp-merge'
result: 'success'
+ prebuilders:
+ - shell: |
+ if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives /usr/lib/jvm/java-1.8.0-openjdk-amd64;fi
+
maven:
maven-name: '{mvn33}'
root-pom: 'pom.xml'
maven:
maven-name: '{mvn33}'
root-pom: 'pom.xml'
@@
-147,6
+173,10
@@
settings: '{honeycomb-settings}'
global-settings: '{global-settings}'
settings: '{honeycomb-settings}'
global-settings: '{global-settings}'
+ postbuilders:
+ - shell: |
+ if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives /usr/lib/jvm/java-1.7.0-openjdk-amd64;fi
+
reporters:
- findbugs
reporters:
- findbugs