(impala) branch master updated: IMPALA-13395: Adds USE_APACHE_COMPONENTS=true in all-build-options job

[michaelsmith]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new af49b687b IMPALA-13395: Adds USE_APACHE_COMPONENTS=true in 
all-build-options job
af49b687b is described below

commit af49b687b7020f6ce4a7cf480ea5e4043de48c16
Author: stiga-huang <huangquanl...@gmail.com>
AuthorDate: Fri Sep 20 15:00:10 2024 +0800

    IMPALA-13395: Adds USE_APACHE_COMPONENTS=true in all-build-options job
    
    The all-build-options-ub2004 job verifies builds with USE_APACHE_HIVE
    being true and false. This extends it to use the new var,
    USE_APACHE_COMPONENTS intead.
    
    Explicitly set USE_APACHE_* based on the value of USE_APACHE_COMPONENTS
    so we won't mess up env vars when switching between builds of different
    USE_APACHE_COMPONENTS values.
    
    Change-Id: Ica516a7554bfe9fa0710b5a437c302934a13c08d
    Reviewed-on: http://gerrit.cloudera.org:8080/21842
    Reviewed-by: Impala Public Jenkins <impala-public-jenk...@cloudera.com>
    Tested-by: Michael Smith <michael.sm...@cloudera.com>
---
 bin/impala-config.sh                       | 24 ++++++++++++------------
 bin/jenkins/build-all-flag-combinations.sh | 12 ++++++------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/bin/impala-config.sh b/bin/impala-config.sh
index 030a302ac..55712ddac 100755
--- a/bin/impala-config.sh
+++ b/bin/impala-config.sh
@@ -369,12 +369,12 @@ if ${USE_APACHE_COMPONENTS:=false}; then
   export IMPALA_PARQUET_VERSION=${APACHE_PARQUET_VERSION}
   export 
IMPALA_RANGER_VERSION=${RANGER_VERSION_OVERRIDE:-"$APACHE_RANGER_VERSION"}
   export IMPALA_TEZ_VERSION=${APACHE_TEZ_VERSION}
-  export USE_APACHE_HADOOP=${USE_APACHE_HADOOP:=true}
-  export USE_APACHE_HBASE=${USE_APACHE_HBASE:=true}
-  export USE_APACHE_HIVE=${USE_APACHE_HIVE:=true}
-  export USE_APACHE_TEZ=${USE_APACHE_TEZ:=true}
-  export USE_APACHE_RANGER=${USE_APACHE_RANGER:=true}
-  export USE_APACHE_OZONE=${USE_APACHE_OZONE:=true}
+  export USE_APACHE_HADOOP=true
+  export USE_APACHE_HBASE=true
+  export USE_APACHE_HIVE=true
+  export USE_APACHE_TEZ=true
+  export USE_APACHE_RANGER=true
+  export USE_APACHE_OZONE=true
 else
   export IMPALA_AVRO_JAVA_VERSION=${CDP_AVRO_JAVA_VERSION}
   export IMPALA_HADOOP_VERSION=${CDP_HADOOP_VERSION}
@@ -390,12 +390,12 @@ else
   export IMPALA_RANGER_URL=${CDP_RANGER_URL-}
   export IMPALA_TEZ_VERSION=${CDP_TEZ_VERSION}
   export IMPALA_TEZ_URL=${CDP_TEZ_URL-}
-  export USE_APACHE_HADOOP=${USE_APACHE_HADOOP:=false}
-  export USE_APACHE_HBASE=${USE_APACHE_HBASE:=false}
-  export USE_APACHE_HIVE=${USE_APACHE_HIVE:=false}
-  export USE_APACHE_TEZ=${USE_APACHE_TEZ:=false}
-  export USE_APACHE_RANGER=${USE_APACHE_RANGER:=false}
-  export USE_APACHE_OZONE=${USE_APACHE_OZONE:=false}
+  export USE_APACHE_HADOOP=false
+  export USE_APACHE_HBASE=false
+  export USE_APACHE_HIVE=false
+  export USE_APACHE_TEZ=false
+  export USE_APACHE_RANGER=false
+  export USE_APACHE_OZONE=false
 fi
 
 export APACHE_COMPONENTS_HOME="$IMPALA_TOOLCHAIN/apache_components"
diff --git a/bin/jenkins/build-all-flag-combinations.sh 
b/bin/jenkins/build-all-flag-combinations.sh
index 1b3bc28b8..4c9394940 100755
--- a/bin/jenkins/build-all-flag-combinations.sh
+++ b/bin/jenkins/build-all-flag-combinations.sh
@@ -46,8 +46,8 @@ CONFIGS=(
   "-skiptests -noclean -tsan"
   "-skiptests -noclean -ubsan -so -ninja"
   # USE_APACHE_HIVE=true build:
-  "-skiptests -noclean -use_apache_hive"
-  "-notests -noclean -use_apache_hive -package"
+  "-skiptests -noclean -use_apache_components"
+  "-notests -noclean -use_apache_components -package"
 )
 
 FAILED=""
@@ -67,14 +67,14 @@ function onexit {
 trap onexit EXIT
 
 for CONFIG in "${CONFIGS[@]}"; do
-  CONFIG2=${CONFIG/-use_apache_hive/}
+  CONFIG2=${CONFIG/-use_apache_components/}
   if [[ "$CONFIG" != "$CONFIG2" ]]; then
     CONFIG=$CONFIG2
-    export USE_APACHE_HIVE=true
+    export USE_APACHE_COMPONENTS=true
   else
-    export USE_APACHE_HIVE=false
+    export USE_APACHE_COMPONENTS=false
   fi
-  DESCRIPTION="Options $CONFIG USE_APACHE_HIVE=$USE_APACHE_HIVE"
+  DESCRIPTION="Options $CONFIG USE_APACHE_COMPONENTS=$USE_APACHE_COMPONENTS"
 
   if [[ $# == 1 && $1 == "--dryrun" ]]; then
     echo $DESCRIPTION