[04/28] impala git commit: IMPALA-6773: Remove Ubuntu 14.04 from supported platforms in bootstrap_*.sh

[ta...@apache.org]

IMPALA-6773: Remove Ubuntu 14.04 from supported platforms in bootstrap_*.sh

Since it's not straight-forward to get Java 8 for Ubuntu 14.04, I'm
removing it from the setups supported by the bootstrap scripts.

Change-Id: I4b6d63c9713cc93a786f82e086feca1a91937e16
Reviewed-on: http://gerrit.cloudera.org:8080/9873
Reviewed-by: Thomas Tauber-Marshall <tm...@cloudera.com>
Tested-by: Impala Public Jenkins


Project: http://git-wip-us.apache.org/repos/asf/impala/repo
Commit: http://git-wip-us.apache.org/repos/asf/impala/commit/12d74448
Tree: http://git-wip-us.apache.org/repos/asf/impala/tree/12d74448
Diff: http://git-wip-us.apache.org/repos/asf/impala/diff/12d74448

Branch: refs/heads/2.x
Commit: 12d744481486f9e5b29a72022eb5d149119360f7
Parents: b96cbfd
Author: Philip Zeyliger <ph...@cloudera.com>
Authored: Fri Mar 30 13:44:21 2018 -0700
Committer: Impala Public Jenkins <im...@gerrit.cloudera.org>
Committed: Wed Apr 11 22:55:59 2018 +0000

----------------------------------------------------------------------
 bin/bootstrap_development.sh |  2 +-
 bin/bootstrap_system.sh      | 20 +++++---------------
 2 files changed, 6 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/impala/blob/12d74448/bin/bootstrap_development.sh
----------------------------------------------------------------------
diff --git a/bin/bootstrap_development.sh b/bin/bootstrap_development.sh
index b6ea369..8ff6f48 100755
--- a/bin/bootstrap_development.sh
+++ b/bin/bootstrap_development.sh
@@ -18,7 +18,7 @@
 # under the License.
 
 # This script bootstraps a development environment from almost nothing; it is known to
-# work on Ubuntu 14.04 and 16.04. It clobbers some local environment and system
+# work on Ubuntu 16.04. It clobbers some local environment and system
 # configurations, so it is best to run this in a fresh install. It also sets up the
 # ~/.bashrc for the calling user and impala-config-local.sh with some environment
 # variables to make Impala compile and run after this script is complete.

http://git-wip-us.apache.org/repos/asf/impala/blob/12d74448/bin/bootstrap_system.sh
----------------------------------------------------------------------
diff --git a/bin/bootstrap_system.sh b/bin/bootstrap_system.sh
index 08a93aa..3a9c42b 100755
--- a/bin/bootstrap_system.sh
+++ b/bin/bootstrap_system.sh
@@ -18,7 +18,7 @@
 # under the License.
 
 # This script bootstraps a system for Impala development from almost nothing; it is known
-# to work on Ubuntu 14.04 and 16.04. It clobbers some local environment and system
+# to work on Ubuntu 16.04. It clobbers some local environment and system
 # configurations, so it is best to run this in a fresh install. It also sets up the
 # ~/.bashrc for the calling user and impala-config-local.sh with some environment
 # variables to make Impala compile and run after this script is complete.
@@ -69,9 +69,9 @@ then
   exit 1
 fi
 
-if ! [[ $DISTRIB_RELEASE = 14.04 || $DISTRIB_RELEASE = 16.04 ]]
+if ! [[ $DISTRIB_RELEASE = 16.04 ]]
 then
-  echo "This script only supports Ubuntu 14.04 and 16.04" >&2
+  echo "This script only supports 16.04" >&2
   exit 1
 fi
 
@@ -107,7 +107,7 @@ apt-get --yes install ccache g++ gcc libffi-dev liblzo2-dev libkrb5-dev \
         krb5-admin-server krb5-kdc krb5-user libsasl2-dev libsasl2-modules \
         libsasl2-modules-gssapi-mit libssl-dev make maven ninja-build ntp \
         ntpdate python-dev python-setuptools postgresql ssh wget vim-common psmisc \
-        lsof
+        lsof openjdk-8-jdk openjdk-8-source openjdk-8-dbg
 
 if ! { service --status-all | grep -E '^ \[ \+ \]  ssh$'; }
 then
@@ -118,14 +118,7 @@ fi
 # TODO: check that there is enough space on disk to do a build and data load
 # TODO: make this work with non-bash shells
 
-JDK_VERSION=8
-if [[ $DISTRIB_RELEASE = 14.04 ]]
-then
-  JDK_VERSION=7
-fi
-apt-get --yes install openjdk-${JDK_VERSION}-jdk openjdk-${JDK_VERSION}-source \
-  openjdk-${JDK_VERSION}-dbg
-SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/java-${JDK_VERSION}-openjdk-amd64"
+SET_JAVA_HOME="export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64"
 echo "$SET_JAVA_HOME" >> "${IMPALA_HOME}/bin/impala-config-local.sh"
 eval "$SET_JAVA_HOME"
 
@@ -148,9 +141,6 @@ sudo service ntp start || grep docker /proc/1/cgroup
 if [[ $DISTRIB_RELEASE = 16.04 ]]
 then
   SET_LD_LIBRARY_PATH='export LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}'
-elif [[ $DISTRIB_RELEASE = 14.04 ]]
-then
-  SET_LD_LIBRARY_PATH="unset LD_LIBRARY_PATH"
 fi
 echo "$SET_LD_LIBRARY_PATH" >> "${IMPALA_HOME}/bin/impala-config-local.sh"
 eval "$SET_LD_LIBRARY_PATH"