diff options
author | Yin Huai <yhuai@databricks.com> | 2015-05-21 15:40:58 -0700 |
---|---|---|
committer | Josh Rosen <joshrosen@databricks.com> | 2015-05-21 15:41:12 -0700 |
commit | 2be72c99aa51ba46f851348af9fbb4a39923a45a (patch) | |
tree | aeb4b0fd16405bccf31dfd4bd4e1010d2a71700c /dev | |
parent | e4489c36df8a3b9bfeadc475429a2173502756bb (diff) | |
download | spark-2be72c99aa51ba46f851348af9fbb4a39923a45a.tar.gz spark-2be72c99aa51ba46f851348af9fbb4a39923a45a.tar.bz2 spark-2be72c99aa51ba46f851348af9fbb4a39923a45a.zip |
[BUILD] Always run SQL tests in master build.
Seems our master build does not run HiveCompatibilitySuite (because _RUN_SQL_TESTS is not set). This PR introduces a property `AMP_JENKINS_PRB` to differentiate a PR build and a regular build. If a build is a regular one, we always set _RUN_SQL_TESTS to true.
cc JoshRosen nchammas
Author: Yin Huai <yhuai@databricks.com>
Closes #5955 from yhuai/runSQLTests and squashes the following commits:
3d399bc [Yin Huai] Always run SQL tests in master build.
(cherry picked from commit 147b6be3b6d464dfc14836c08e690ab021a600de)
Signed-off-by: Josh Rosen <joshrosen@databricks.com>
Diffstat (limited to 'dev')
-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 65a5cb9828..958a6b6dbb 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="$?" |