Skip to content

Commit

Permalink
Pass Maven test flags from CI to Hive tests
Browse files Browse the repository at this point in the history
  • Loading branch information
nineinchnick authored and hashhar committed Feb 28, 2022
1 parent aa95c13 commit 029d9c0
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ stop_unnecessary_hadoop_services
# run product tests
pushd $PROJECT_ROOT
set +e
./mvnw -B -pl :trino-hive-hadoop2 test -P test-hive-hadoop2-abfs-access-key \
./mvnw ${MAVEN_TEST:--B} -pl :trino-hive-hadoop2 test -P test-hive-hadoop2-abfs-access-key \
-DHADOOP_USER_NAME=hive \
-Dhive.hadoop2.metastoreHost=localhost \
-Dhive.hadoop2.metastorePort=9083 \
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-hive-hadoop2/bin/run_hive_abfs_oauth_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ stop_unnecessary_hadoop_services

pushd $PROJECT_ROOT
set +e
./mvnw -B -pl :trino-hive-hadoop2 test -P test-hive-hadoop2-abfs-oauth \
./mvnw ${MAVEN_TEST:--B} -pl :trino-hive-hadoop2 test -P test-hive-hadoop2-abfs-oauth \
-DHADOOP_USER_NAME=hive \
-Dhive.hadoop2.metastoreHost=localhost \
-Dhive.hadoop2.metastorePort=9083 \
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-hive-hadoop2/bin/run_hive_adl_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ stop_unnecessary_hadoop_services
# run product tests
pushd $PROJECT_ROOT
set +e
./mvnw -B -pl :trino-hive-hadoop2 test -P test-hive-hadoop2-adl \
./mvnw ${MAVEN_TEST:--B} -pl :trino-hive-hadoop2 test -P test-hive-hadoop2-adl \
-DHADOOP_USER_NAME=hive \
-Dhive.hadoop2.metastoreHost=localhost \
-Dhive.hadoop2.metastorePort=9083 \
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-hive-hadoop2/bin/run_hive_alluxio_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function main () {
# run product tests
pushd ${PROJECT_ROOT}
set +e
./mvnw -B -pl :trino-hive-hadoop2 test -P test-hive-hadoop2-alluxio \
./mvnw ${MAVEN_TEST:--B} -pl :trino-hive-hadoop2 test -P test-hive-hadoop2-alluxio \
-Dhive.hadoop2.alluxio.host=localhost \
-Dhive.hadoop2.alluxio.port=19998 \
-Dhive.hadoop2.hiveVersionMajor="${TESTS_HIVE_VERSION_MAJOR}" \
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-hive-hadoop2/bin/run_hive_s3_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ retry check_hadoop
# run product tests
pushd "${PROJECT_ROOT}"
set +e
./mvnw -B -pl :trino-hive-hadoop2 test -P test-hive-hadoop2-s3 \
./mvnw ${MAVEN_TEST:--B} -pl :trino-hive-hadoop2 test -P test-hive-hadoop2-s3 \
-DHADOOP_USER_NAME=hive \
-Dhive.hadoop2.metastoreHost=localhost \
-Dhive.hadoop2.metastorePort=9083 \
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-hive-hadoop2/bin/run_hive_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ HADOOP_MASTER_IP=$(hadoop_master_ip)
# run product tests
pushd "${PROJECT_ROOT}"
set +e
./mvnw -B -pl :trino-hive-hadoop2 test -P test-hive-hadoop2 \
./mvnw ${MAVEN_TEST:--B} -pl :trino-hive-hadoop2 test -P test-hive-hadoop2 \
-DHADOOP_USER_NAME=hive \
-Dhive.hadoop2.metastoreHost=localhost \
-Dhive.hadoop2.metastorePort=9083 \
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-hive-hadoop2/bin/run_hive_wasb_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ stop_unnecessary_hadoop_services
# run product tests
pushd $PROJECT_ROOT
set +e
./mvnw -B -pl :trino-hive-hadoop2 test -P test-hive-hadoop2-wasb \
./mvnw ${MAVEN_TEST:--B} -pl :trino-hive-hadoop2 test -P test-hive-hadoop2-wasb \
-DHADOOP_USER_NAME=hive \
-Dhive.hadoop2.metastoreHost=localhost \
-Dhive.hadoop2.metastorePort=9083 \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -xeuo pipefail
trap "exit" INT # allows to terminate script on ctrl+c instead of terminating single mvnw execution

maven="${BASH_SOURCE%/*}/../../../mvnw"
maven_run_tests="${maven} clean test -Dair.check.skip-all=true -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -B -pl :trino-test-jdbc-compatibility-old-driver"
maven_run_tests="${maven} clean test ${MAVEN_TEST:--B} -pl :trino-test-jdbc-compatibility-old-driver"

"${maven}" -version

Expand Down

0 comments on commit 029d9c0

Please sign in to comment.