diff options
author | Yin Huai <yhuai@databricks.com> | 2015-05-25 18:23:58 -0700 |
---|---|---|
committer | Reynold Xin <rxin@databricks.com> | 2015-05-25 18:24:07 -0700 |
commit | 44b22a3f11f56a76dff252bc4ef8d56506fa9df7 (patch) | |
tree | 5e27f16c78e5c6414c7010506736b78cafeac2b9 | |
parent | d5572ab79ac48fdd28aada960391ed7bc79df8e6 (diff) | |
download | spark-44b22a3f11f56a76dff252bc4ef8d56506fa9df7.tar.gz spark-44b22a3f11f56a76dff252bc4ef8d56506fa9df7.tar.bz2 spark-44b22a3f11f56a76dff252bc4ef8d56506fa9df7.zip |
[SPARK-7832] [Build] Always run SQL tests in master build.
https://issues.apache.org/jira/browse/SPARK-7832
Author: Yin Huai <yhuai@databricks.com>
Closes #6385 from yhuai/runSQLTests and squashes the following commits:
3d399bc [Yin Huai] Always run SQL tests in master build.
(cherry picked from commit f38e619c41d242143c916373f2a44ec674679f19)
Signed-off-by: Reynold Xin <rxin@databricks.com>
-rwxr-xr-x | dev/run-tests | 41 | ||||
-rwxr-xr-x | dev/run-tests-jenkins | 2 |
2 files changed, 26 insertions, 17 deletions
diff --git a/dev/run-tests b/dev/run-tests index d5d2a42701..ba1eee6366 100755 --- a/dev/run-tests +++ b/dev/run-tests @@ -82,24 +82,31 @@ export SBT_MAVEN_PROFILES_ARGS="$SBT_MAVEN_PROFILES_ARGS -Pkinesis-asl" if [ -n "$AMPLAB_JENKINS" ]; then git fetch origin master:master - 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 + # 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. + _RUN_SQL_TESTS=true fi fi diff --git a/dev/run-tests-jenkins b/dev/run-tests-jenkins index f452ab66ef..8b2a44fd72 100755 --- a/dev/run-tests-jenkins +++ b/dev/run-tests-jenkins @@ -185,6 +185,8 @@ done # run tests { + # Marks this build is a pull request build. + export AMP_JENKINS_PRB=true timeout "${TESTS_TIMEOUT}" ./dev/run-tests test_result="$?" |