diff options
| author |   C.J. Collier <cjcollier@linuxfoundation.org> | 2016-07-21 13:33:56 -0700 |
|---|---|---|
| committer | C.J. Collier <cjcollier@linuxfoundation.org> | 2016-07-21 13:33:56 -0700 |
| commit | fac9dc9eb2bf3761d140e1d3ac5b621ce5ca5c0b (patch) | |
| tree | a6ae91e198438489d044c13ca020b78f4395ddef /jjb | |
| parent | 0c5de29b8355e3e0ec73080f57f290e25a52fcfc (diff) | |
Ignoring failure in update-java-alternatives
* The script fails, though the failure can be ignored.
http://askubuntu.com/questions/599105/using-alternatives-with-java-7-and-java-8-on-14-04-2-lts
Change-Id: Ie7b70fb189505a46b6640f1a961001f0c75a21b5
Signed-off-by: C.J. Collier <cjcollier@linuxfoundation.org>
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/honeycomb/honeycomb.yaml | 16 | ||||
| -rw-r--r-- | jjb/vpp/include-raw-vpp-build.sh | 2 | ||||
| -rw-r--r-- | jjb/vpp/include-raw-vpp-lite-build.sh | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml index c82a71512..a8f46ed13 100644 --- a/jjb/honeycomb/honeycomb.yaml +++ b/jjb/honeycomb/honeycomb.yaml @@ -55,7 +55,7 @@ prebuilders: - shell: | - if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /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||echo 'ignoring failure';fi maven: maven-name: '{mvn33}' root-pom: 'pom.xml' @@ -68,7 +68,7 @@ postbuilders: - shell: | - if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /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||echo 'ignoring failure';fi publishers: - email-notification: @@ -126,7 +126,7 @@ prebuilders: - shell: | - if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /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||echo 'ignoring failure';fi maven: maven-name: '{mvn33}' root-pom: 'pom.xml' @@ -139,7 +139,7 @@ postbuilders: - shell: | - if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /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||echo 'ignoring failure';fi publishers: - email-notification: @@ -185,7 +185,7 @@ prebuilders: - shell: | - if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /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||echo 'ignoring failure';fi maven: maven-name: '{mvn33}' @@ -199,7 +199,7 @@ postbuilders: - shell: | - if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /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||echo 'ignoring failure';fi reporters: - findbugs @@ -250,7 +250,7 @@ prebuilders: - shell: | - if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /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||echo 'ignoring failure';fi maven: maven-name: '{mvn33}' @@ -278,7 +278,7 @@ - ../scripts/maven_push_functions.sh - include-raw-honeycomb-pkg-push.sh - shell: | - if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /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||echo 'ignoring failure';fi reporters: - findbugs diff --git a/jjb/vpp/include-raw-vpp-build.sh b/jjb/vpp/include-raw-vpp-build.sh index 61c06ba19..a47fc62ec 100644 --- a/jjb/vpp/include-raw-vpp-build.sh +++ b/jjb/vpp/include-raw-vpp-build.sh @@ -50,7 +50,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 -s /usr/lib/jvm/java-1.7.0-openjdk-amd64 + sudo update-java-alternatives -s /usr/lib/jvm/java-1.7.0-openjdk-amd64 || echo 'ignoring failure' fi build-root/vagrant/build.sh diff --git a/jjb/vpp/include-raw-vpp-lite-build.sh b/jjb/vpp/include-raw-vpp-lite-build.sh index eca0761c9..9e1133afd 100644 --- a/jjb/vpp/include-raw-vpp-lite-build.sh +++ b/jjb/vpp/include-raw-vpp-lite-build.sh @@ -50,7 +50,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 -s /usr/lib/jvm/java-1.7.0-openjdk-amd64 + sudo update-java-alternatives -s /usr/lib/jvm/java-1.7.0-openjdk-amd64 || echo 'ignoring failure' fi make UNATTENDED=yes install-dep |