This is an automated email from the ASF dual-hosted git repository. joemcdonnell pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/impala.git
commit d0cfdd139fe81a52f420c7878b5e90c6e30ea6fe Author: Joe McDonnell <[email protected]> AuthorDate: Sun May 22 16:47:06 2022 -0700 IMPALA-10199: Add Ubuntu 20 toolchain configuration Ubuntu 20 has been using the toolchain from Ubuntu 18. Since Ubuntu 20 has been added to the toolchain, this switches Impala to use a toolchain with Ubuntu 20 support and uses the Ubuntu 20 bits. This is expected to help with IMPALA-10962. Testing: - Ran a core build on Ubuntu 20 Change-Id: If2394b668ef3c56b1a4c0773fd5e4ff92be4a846 Reviewed-on: http://gerrit.cloudera.org:8080/18559 Reviewed-by: Joe McDonnell <[email protected]> Reviewed-by: Michael Smith <[email protected]> Tested-by: Impala Public Jenkins <[email protected]> --- bin/bootstrap_toolchain.py | 4 +--- bin/impala-config.sh | 8 ++++---- docker/CMakeLists.txt | 2 ++ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/bootstrap_toolchain.py b/bin/bootstrap_toolchain.py index 6624c6652..60bb57093 100755 --- a/bin/bootstrap_toolchain.py +++ b/bin/bootstrap_toolchain.py @@ -71,8 +71,6 @@ 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), @@ -96,7 +94,7 @@ OS_MAPPING = [ OsMapping("ubuntu15.10", "ec2-package-ubuntu-14-04", None), OsMapping('ubuntu16.04', "ec2-package-ubuntu-16-04", "ubuntu1604"), OsMapping('ubuntu18.04', "ec2-package-ubuntu-18-04", "ubuntu1804"), - OsMapping('ubuntu20.04', "ec2-package-ubuntu-18-04", "ubuntu1804") + OsMapping('ubuntu20.04', "ec2-package-ubuntu-20-04", "ubuntu2004") ] diff --git a/bin/impala-config.sh b/bin/impala-config.sh index bf8c360cc..8c48ffc55 100755 --- a/bin/impala-config.sh +++ b/bin/impala-config.sh @@ -77,7 +77,7 @@ export IMPALA_VERSION=4.1.0-SNAPSHOT # moving to a different build of the toolchain, e.g. when a version is bumped or a # compile option is changed. The build id can be found in the output of the toolchain # build jobs, it is constructed from the build number and toolchain git hash prefix. -export IMPALA_TOOLCHAIN_BUILD_ID=158-18c815af9d +export IMPALA_TOOLCHAIN_BUILD_ID=162-3b0a0d993a # Versions of toolchain dependencies. # ----------------------------------- export IMPALA_AVRO_VERSION=1.7.4-p5 @@ -120,9 +120,9 @@ export IMPALA_LIBEV_VERSION=4.20-p1 unset IMPALA_LIBEV_URL export IMPALA_LIBUNWIND_VERSION=1.3-rc1-p3 unset IMPALA_LIBUNWIND_URL -export IMPALA_LLVM_VERSION=5.0.1-p3 +export IMPALA_LLVM_VERSION=5.0.1-p4 unset IMPALA_LLVM_URL -export IMPALA_LLVM_ASAN_VERSION=5.0.1-p3 +export IMPALA_LLVM_ASAN_VERSION=5.0.1-p4 unset IMPALA_LLVM_ASAN_URL # Maximum memory available for mini-cluster and CDH cluster @@ -135,7 +135,7 @@ export IMPALA_LLVM_UBSAN_BASE_VERSION=5.0.1 # Debug builds should use the release+asserts build to get additional coverage. # Don't use the LLVM debug build because the binaries are too large to distribute. -export IMPALA_LLVM_DEBUG_VERSION=5.0.1-asserts-p3 +export IMPALA_LLVM_DEBUG_VERSION=5.0.1-asserts-p4 unset IMPALA_LLVM_DEBUG_URL export IMPALA_LZ4_VERSION=1.9.3 unset IMPALA_LZ4_URL diff --git a/docker/CMakeLists.txt b/docker/CMakeLists.txt index 9b45a11a4..37396c67f 100644 --- a/docker/CMakeLists.txt +++ b/docker/CMakeLists.txt @@ -39,6 +39,8 @@ if(${LSB_RELEASE_ID} STREQUAL "Ubuntu" AND ${LSB_RELEASE_VERSION} STREQUAL "16.0 set(DISTRO_BASE_IMAGE "ubuntu:16.04") elseif(${LSB_RELEASE_ID} STREQUAL "Ubuntu" AND ${LSB_RELEASE_VERSION} STREQUAL "18.04") set(DISTRO_BASE_IMAGE "ubuntu:18.04") +elseif(${LSB_RELEASE_ID} STREQUAL "Ubuntu" AND ${LSB_RELEASE_VERSION} STREQUAL "20.04") + set(DISTRO_BASE_IMAGE "ubuntu:20.04") else() set(DISTRO_BASE_IMAGE "UNSUPPORTED") endif()
