You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2015/05/22 19:04:51 UTC
spark git commit: Revert "[BUILD] Always run SQL tests in master
build."
Repository: spark
Updated Branches:
refs/heads/master f490b3b4c -> c63036cd4
Revert "[BUILD] Always run SQL tests in master build."
This reverts commit 147b6be3b6d464dfc14836c08e690ab021a600de.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c63036cd
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c63036cd
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c63036cd
Branch: refs/heads/master
Commit: c63036cd475cfc26093c296ca1be13802c51093a
Parents: f490b3b
Author: Patrick Wendell <pa...@databricks.com>
Authored: Fri May 22 10:04:45 2015 -0700
Committer: Patrick Wendell <pa...@databricks.com>
Committed: Fri May 22 10:04:45 2015 -0700
----------------------------------------------------------------------
dev/run-tests | 41 +++++++++++++++++------------------------
dev/run-tests-jenkins | 2 --
2 files changed, 17 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/c63036cd/dev/run-tests
----------------------------------------------------------------------
diff --git a/dev/run-tests b/dev/run-tests
index b444e74..44d8027 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
http://git-wip-us.apache.org/repos/asf/spark/blob/c63036cd/dev/run-tests-jenkins
----------------------------------------------------------------------
diff --git a/dev/run-tests-jenkins b/dev/run-tests-jenkins
index 8b2a44f..f452ab6 100755
--- a/dev/run-tests-jenkins
+++ b/dev/run-tests-jenkins
@@ -185,8 +185,6 @@ 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