diff options
| author |   Ed Warnicke <eaw@cisco.com> | 2016-05-06 12:32:03 -0500 |
|---|---|---|
| committer | Ed Warnicke <eaw@cisco.com> | 2016-05-06 12:32:03 -0500 |
| commit | 2023bc4be28ff3853e18e8e968fc82415bc3daa5 (patch) | |
| tree | 69a8781786ff64e5a6922003c8ec6ddaf11ddff0 /jjb | |
| parent | 243d1fbbc7146792575b5ec920c1ad89b810abab (diff) | |
Fix for javahome update
Change-Id: Ifbe5962e0161ccf223baa4bb4fc03f8c86d859b1
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/honeycomb/honeycomb.yaml | 12 | ||||
| -rw-r--r-- | jjb/vpp/include-raw-vpp-build.sh | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml index e10973449..a1d0994fd 100644 --- a/jjb/honeycomb/honeycomb.yaml +++ b/jjb/honeycomb/honeycomb.yaml @@ -47,7 +47,7 @@ prebuilders: - shell: | - if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives /usr/lib/jvm/java-1.8.0-openjdk-amd64;fi + if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64;fi maven: maven-name: '{mvn33}' root-pom: 'pom.xml' @@ -58,7 +58,7 @@ postbuilders: - shell: | - if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives /usr/lib/jvm/java-1.7.0-openjdk-amd64;fi + if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.7.0-openjdk-amd64;fi publishers: - email-notification: @@ -101,7 +101,7 @@ prebuilders: - shell: | - if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives /usr/lib/jvm/java-1.8.0-openjdk-amd64;fi + if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64;fi maven: maven-name: '{mvn33}' @@ -113,7 +113,7 @@ postbuilders: - shell: | - if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives /usr/lib/jvm/java-1.7.0-openjdk-amd64;fi + if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.7.0-openjdk-amd64;fi reporters: - findbugs @@ -163,7 +163,7 @@ prebuilders: - shell: | - if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives /usr/lib/jvm/java-1.8.0-openjdk-amd64;fi + if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64;fi maven: maven-name: '{mvn33}' @@ -175,7 +175,7 @@ postbuilders: - shell: | - if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives /usr/lib/jvm/java-1.7.0-openjdk-amd64;fi + if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /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 e5a9be3f1..043f92d72 100644 --- a/jjb/vpp/include-raw-vpp-build.sh +++ b/jjb/vpp/include-raw-vpp-build.sh @@ -15,7 +15,7 @@ fi # 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 + sudo update-java-alternatives -s /usr/lib/jvm/java-1.7.0-openjdk-amd64 fi build-root/vagrant/build.sh |