Skip to content
Snippets Groups Projects
Commit c63036cd authored by Patrick Wendell's avatar Patrick Wendell
Browse files

Revert "[BUILD] Always run SQL tests in master build."

This reverts commit 147b6be3.
parent f490b3b4
No related branches found
No related tags found
No related merge requests found
...@@ -82,31 +82,24 @@ export SBT_MAVEN_PROFILES_ARGS="$SBT_MAVEN_PROFILES_ARGS -Pkinesis-asl" ...@@ -82,31 +82,24 @@ export SBT_MAVEN_PROFILES_ARGS="$SBT_MAVEN_PROFILES_ARGS -Pkinesis-asl"
if [ -n "$AMPLAB_JENKINS" ]; then if [ -n "$AMPLAB_JENKINS" ]; then
git fetch origin master:master git fetch origin master:master
# AMP_JENKINS_PRB indicates if the current build is a pull request build. sql_diffs=$(
if [ -n "$AMP_JENKINS_PRB" ]; then git diff --name-only master \
# It is a pull request build. | grep -e "^sql/" -e "^bin/spark-sql" -e "^sbin/start-thriftserver.sh"
sql_diffs=$( )
git diff --name-only master \
| grep -e "^sql/" -e "^bin/spark-sql" -e "^sbin/start-thriftserver.sh" non_sql_diffs=$(
) git diff --name-only master \
| grep -v -e "^sql/" -e "^bin/spark-sql" -e "^sbin/start-thriftserver.sh"
non_sql_diffs=$( )
git diff --name-only master \
| grep -v -e "^sql/" -e "^bin/spark-sql" -e "^sbin/start-thriftserver.sh" if [ -n "$sql_diffs" ]; then
) echo "[info] Detected changes in SQL. Will run Hive test suite."
if [ -n "$sql_diffs" ]; then
echo "[info] Detected changes in SQL. Will run Hive test suite."
_RUN_SQL_TESTS=true
if [ -z "$non_sql_diffs" ]; then
echo "[info] Detected no changes except in SQL. Will only run SQL tests."
_SQL_TESTS_ONLY=true
fi
fi
else
# It is a regular build. We should run SQL tests.
_RUN_SQL_TESTS=true _RUN_SQL_TESTS=true
if [ -z "$non_sql_diffs" ]; then
echo "[info] Detected no changes except in SQL. Will only run SQL tests."
_SQL_TESTS_ONLY=true
fi
fi fi
fi fi
......
...@@ -185,8 +185,6 @@ done ...@@ -185,8 +185,6 @@ done
# run tests # run tests
{ {
# Marks this build is a pull request build.
export AMP_JENKINS_PRB=true
timeout "${TESTS_TIMEOUT}" ./dev/run-tests timeout "${TESTS_TIMEOUT}" ./dev/run-tests
test_result="$?" test_result="$?"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment