You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by jo...@apache.org on 2015/05/22 00:41:06 UTC
spark git commit: [BUILD] Always run SQL tests in master build.
Repository: spark
Updated Branches:
refs/heads/master 5a3c04bb9 -> 147b6be3b
[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 <yh...@databricks.com>
Closes #5955 from yhuai/runSQLTests and squashes the following commits:
3d399bc [Yin Huai] Always run SQL tests in master build.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/147b6be3
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/147b6be3
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/147b6be3
Branch: refs/heads/master
Commit: 147b6be3b6d464dfc14836c08e690ab021a600de
Parents: 5a3c04b
Author: Yin Huai <yh...@databricks.com>
Authored: Thu May 21 15:40:58 2015 -0700
Committer: Josh Rosen <jo...@databricks.com>
Committed: Thu May 21 15:40:58 2015 -0700
----------------------------------------------------------------------
dev/run-tests | 41 ++++++++++++++++++++++++-----------------
dev/run-tests-jenkins | 2 ++
2 files changed, 26 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/147b6be3/dev/run-tests
----------------------------------------------------------------------
diff --git a/dev/run-tests b/dev/run-tests
index 44d8027..b444e74 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
http://git-wip-us.apache.org/repos/asf/spark/blob/147b6be3/dev/run-tests-jenkins
----------------------------------------------------------------------
diff --git a/dev/run-tests-jenkins b/dev/run-tests-jenkins
index f452ab6..8b2a44f 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="$?"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org