[impala] 02/02: IMPALA-10007: Impala development environment does not support Ubuntu 20.04

[ta...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tarmstrong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git

commit 61a020d0f89ef1d6e736495aa2a98f7693dc7f39
Author: Qifan Chen <qc...@cloudera.com>
AuthorDate: Fri Jul 24 16:51:25 2020 -0400

    IMPALA-10007: Impala development environment does not support
    Ubuntu 20.04
    
    This is a minor amendment to a previously merged change with
    ChangeId I4f592f60881fd8f34e2bf393a76f5a921505010a, to address
    additional review comments. In particular, the original commit
    referred to Ubuntu 20.4 whereas it should have used Ubuntu 20.04.
    
    Change-Id: I7db302b4f1d57ec9aa2100d7589d5e814db75947
    Reviewed-on: http://gerrit.cloudera.org:8080/16241
    Reviewed-by: Impala Public Jenkins <im...@cloudera.com>
    Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
 bin/bootstrap_system.sh    | 2 +-
 bin/bootstrap_toolchain.py | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/bootstrap_system.sh b/bin/bootstrap_system.sh
index bd448e0..f6c33a3 100755
--- a/bin/bootstrap_system.sh
+++ b/bin/bootstrap_system.sh
@@ -244,7 +244,7 @@ if [[ "$UBUNTU" == true ]]; then
   fi
 fi
 
-# Ubuntu 18.04 or 20.04 install OpenJDK 11 and configure it as the default Java version.
+# Ubuntu 18.04 and 20.04 install OpenJDK 11 and configure it as the default Java version.
 # Impala is currently tested with OpenJDK 8, so configure that version as the default.
 if [[ $ARCH_NAME == 'aarch64' ]]; then
     ubuntu20 sudo update-java-alternatives -s java-1.8.0-openjdk-arm64
diff --git a/bin/bootstrap_toolchain.py b/bin/bootstrap_toolchain.py
index 71e81d6..494b97c 100755
--- a/bin/bootstrap_toolchain.py
+++ b/bin/bootstrap_toolchain.py
@@ -71,6 +71,8 @@ from string import Template
 
 # Maps return values from 'lsb_release -irs' to the corresponding OS labels for both the
 # toolchain and the CDP components.
+# For Ubuntu20.04, the toolchain and CDP components to be mapped to are still 18.04
+# based, due to the unavailability of 20.04 parts on EC2.
 OsMapping = namedtuple('OsMapping', ['lsb_release', 'toolchain', 'cdh'])
 OS_MAPPING = [
   OsMapping("centos5", "ec2-package-centos-5", None),