diff options
| author |   Ed Warnicke <eaw@cisco.com> | 2016-05-06 10:50:45 -0500 |
|---|---|---|
| committer | Ed Warnicke <eaw@cisco.com> | 2016-05-06 11:17:29 -0500 |
| commit | d8d17c7448a7b9c59b4381951e25a12c7cdd1cd0 (patch) | |
| tree | 579ea1577809900e2ce831c721f45fab42ae74de /jjb/honeycomb | |
| parent | 35f70352f66badc4bbd6cd9f81cf88628be75c64 (diff) | |
Fix for java home for honeycomb
Change-Id: Ib4381c10763251105ca1fc418e70c0e06905ba9a
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Diffstat (limited to 'jjb/honeycomb')
| -rw-r--r-- | jjb/honeycomb/honeycomb.yaml | 42 |
1 files changed, 36 insertions, 6 deletions
diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml index 0eb94c46f..e10973449 100644 --- a/jjb/honeycomb/honeycomb.yaml +++ b/jjb/honeycomb/honeycomb.yaml @@ -1,14 +1,15 @@ - 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' + os: 'ubuntu1404' - job-template: - name: 'honeycomb-verify' + name: 'honeycomb-verify-{branch}-{os}' project-type: maven node: verify concurrent: true @@ -24,6 +25,8 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' + - os-parameter: + os: '{os}' scm: - gerrit-trigger-scm: @@ -42,6 +45,9 @@ 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' @@ -50,12 +56,16 @@ 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: - name: 'honeycomb-merge' + name: 'honeycomb-merge-{branch}-{os}' project-type: maven node: merge jdk: '{jdk}' @@ -69,6 +79,8 @@ parameters: - project-parameter: project: '{project}' + - os-parameter: + os: '{os}' scm: - gerrit-trigger-scm: @@ -87,6 +99,10 @@ 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' @@ -95,6 +111,10 @@ 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 @@ -107,7 +127,7 @@ deploy-unstable: false - job-template: - name: 'honeycomb-integration' + name: 'honeycomb-integration-{branch}-{os}' project-type: maven node: merge jdk: '{jdk}' @@ -121,6 +141,8 @@ parameters: - project-parameter: project: '{project}' + - os-parameter: + os: '{os}' scm: - git-scm: @@ -139,6 +161,10 @@ 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' @@ -147,6 +173,10 @@ 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 |