Skip to content

Commit bc15fa5

Browse files
ranade1agl29
authored andcommitted
[multi-python] Refactor build scripts for better multi-Python version handling and SQLite installation
- Simplified install_prerequisite() to consistently pass OS argument to all per-OS install functions. - Split responsibilities by creating: - install_build_dependencies(): install system-level packages only. - install_sqlite3(): install SQLite 3.35.5 if missing. - install_python38(), install_python39(), install_python311(): individual Python installers. - install_sqlite_python(): orchestrates installing SQLite and appropriate Python version. - General code cleanup: removed redundancy, unified style, improved modularity, and added error handling. Change-Id: If17af9ea2c1ca99c575a937f767e5e1d7b016194 (cherry picked from commit ed9cfb0723e618f155b3e96d61a53aa03e2909ac)
1 parent 49c32c4 commit bc15fa5

File tree

2 files changed

+282
-169
lines changed

2 files changed

+282
-169
lines changed

tools/cloudera/build_hue_cloudera.sh

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ BUILDTYPE=$1
3737
DOCKEROS=$2
3838
HUE_JAR_VERSION=$3
3939

40-
PYTHON38_OSES=("centos7" "redhat8" "sles12" "ubuntu18" "ubuntu20")
41-
PYTHON39_OSES=("redhat8" "redhat8-arm64" "redhat9", "ubuntu22")
40+
PYTHON38_OSES=("centos7" "redhat8" "sles12" "ubuntu20" "ubuntu22")
41+
PYTHON39_OSES=("redhat8" "redhat8-arm64" "redhat9")
4242
PYTHON311_OSES=("redhat8" "redhat8-arm64" "redhat9" "sles15" "ubuntu22")
4343

4444
LATEST_PYTHON="python3.11"
@@ -54,6 +54,7 @@ export SQLITE3_PATH=${SQLITE3_PATH:="${TOOLS_HOME}/sqlite/bin/sqlite3"}
5454
export ORACLE_INSTANTCLIENT19_PATH="/opt/toolchain/instantclient_19_15"
5555
export LD_LIBRARY_PATH="/usr/local/lib:$ORACLE_INSTANTCLIENT19_PATH:$LD_LIBRARY_PATH"
5656
export LD_RUN_PATH="/usr/local/lib:$ORACLE_INSTANTCLIENT19_PATH:$LD_RUN_PATH"
57+
export ORIGINAL_PATH=$PATH
5758

5859
setup_python_env() {
5960
local ver="$1" os="$2"
@@ -97,15 +98,15 @@ install_prerequisite() {
9798
local os="$1"
9899

99100
case "$os" in
100-
centos7) centos7_install ;;
101-
redhat8|snapshot) redhat8_install ;;
102-
redhat9) redhat9_install ;;
103-
sles12) sles12_install ;;
104-
sles15) sles15_install ;;
105-
ubuntu18) ubuntu18_install ;;
106-
ubuntu20) ubuntu20_install ;;
107-
ubuntu22) ubuntu22_install ;;
108-
redhat8-arm64) redhat8_arm64_install ;;
101+
centos7) centos7_install "$os";;
102+
redhat8|snapshot) redhat8_install "$os";;
103+
redhat9) redhat9_install "$os";;
104+
sles12) sles12_install "$os";;
105+
sles15) sles15_install "$os";;
106+
ubuntu18) ubuntu18_install "$os";;
107+
ubuntu20) ubuntu20_install "$os";;
108+
ubuntu22) ubuntu22_install "$os";;
109+
redhat8-arm64) redhat8_arm64_install "$os";;
109110
*) echo "Unsupported OS: $os"; exit 1 ;;
110111
esac
111112

0 commit comments

Comments
 (0)