diff options
| author |   C.J. Collier <cjcollier@linuxfoundation.org> | 2016-05-06 17:00:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2016-05-06 17:00:58 +0000 |
| commit | 243d1fbbc7146792575b5ec920c1ad89b810abab (patch) | |
| tree | 5fa69ee708ae92d92b79a491ad298203fe573f46 | |
| parent | ef7b4e771dd98b010f667eaee6c1e24bfcf3b507 (diff) | |
| parent | d8d17c7448a7b9c59b4381951e25a12c7cdd1cd0 (diff) | |
Merge "Fix for java home for honeycomb"
| -rw-r--r-- | jjb/honeycomb/honeycomb.yaml | 42 | ||||
| -rw-r--r-- | jjb/vpp/include-raw-vpp-build.sh | 7 |
2 files changed, 43 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 diff --git a/jjb/vpp/include-raw-vpp-build.sh b/jjb/vpp/include-raw-vpp-build.sh index 7ea6d6d59..e5a9be3f1 100644 --- a/jjb/vpp/include-raw-vpp-build.sh +++ b/jjb/vpp/include-raw-vpp-build.sh @@ -11,4 +11,11 @@ else echo $CCACHE_DIR does not exist. This must be a new slave. fi +# Make sure we are starting on java-7. This catches bugs in the +# vpp build system that can occur on Ubuntu 14.04 when a user may +# have both java-7 and java-8 installed. +if [ ${OS} == ubuntu1404 ];then + sudo update-java-alternatives /usr/lib/jvm/java-1.7.0-openjdk-amd64 +fi + build-root/vagrant/build.sh |