diff options
author | Patrick Wendell <patrick@databricks.com> | 2015-05-22 10:04:45 -0700 |
---|---|---|
committer | Patrick Wendell <patrick@databricks.com> | 2015-05-22 10:04:45 -0700 |
commit | c63036cd475cfc26093c296ca1be13802c51093a (patch) | |
tree | 5e02384e3eea47e84d0497298d07b5a355888052 /dev/run-tests | |
parent | f490b3b4c706c92aa65d000b9d885f4d160a5f39 (diff) | |
download | spark-c63036cd475cfc26093c296ca1be13802c51093a.tar.gz spark-c63036cd475cfc26093c296ca1be13802c51093a.tar.bz2 spark-c63036cd475cfc26093c296ca1be13802c51093a.zip |
Revert "[BUILD] Always run SQL tests in master build."
This reverts commit 147b6be3b6d464dfc14836c08e690ab021a600de.
Diffstat (limited to 'dev/run-tests')
-rwxr-xr-x | dev/run-tests | 41 |
1 files changed, 17 insertions, 24 deletions
diff --git a/dev/run-tests b/dev/run-tests index b444e74706..44d802782c 100755 --- a/dev/run-tests +++ b/dev/run-tests @@ -82,31 +82,24 @@ export SBT_MAVEN_PROFILES_ARGS="$SBT_MAVEN_PROFILES_ARGS -Pkinesis-asl" if [ -n "$AMPLAB_JENKINS" ]; then git fetch origin master:master - # AMP_JENKINS_PRB indicates if the current build is a pull request build. - if [ -n "$AMP_JENKINS_PRB" ]; then - # It is a pull request build. - 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" - ) - - 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. + 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" + ) + + 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 fi |