You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2015/06/04 03:08:56 UTC
spark git commit: [BUILD] Use right branch when checking against Hive
Repository: spark
Updated Branches:
refs/heads/master e35cd36e0 -> 9cf740f35
[BUILD] Use right branch when checking against Hive
Right now we always run hive tests in branch-1.4 PRs because we compare whether the diff against master involves hive changes. Really we should be comparing against the target branch itself.
Author: Andrew Or <an...@databricks.com>
Closes #6629 from andrewor14/build-check-hive and squashes the following commits:
450fbbd [Andrew Or] [BUILD] Use right branch when checking against Hive
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/9cf740f3
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/9cf740f3
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/9cf740f3
Branch: refs/heads/master
Commit: 9cf740f357fef00b5251618b20501774852f8a28
Parents: e35cd36
Author: Andrew Or <an...@databricks.com>
Authored: Wed Jun 3 18:08:53 2015 -0700
Committer: Andrew Or <an...@databricks.com>
Committed: Wed Jun 3 18:08:53 2015 -0700
----------------------------------------------------------------------
dev/run-tests | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/9cf740f3/dev/run-tests
----------------------------------------------------------------------
diff --git a/dev/run-tests b/dev/run-tests
index 7dd8d31..d178e2a 100755
--- a/dev/run-tests
+++ b/dev/run-tests
@@ -80,18 +80,19 @@ export SBT_MAVEN_PROFILES_ARGS="$SBT_MAVEN_PROFILES_ARGS -Pkinesis-asl"
# Only run Hive tests if there are SQL changes.
# Partial solution for SPARK-1455.
if [ -n "$AMPLAB_JENKINS" ]; then
- git fetch origin master:master
+ target_branch="$ghprbTargetBranch"
+ git fetch origin "$target_branch":"$target_branch"
# 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 \
+ git diff --name-only "$target_branch" \
| grep -e "^sql/" -e "^bin/spark-sql" -e "^sbin/start-thriftserver.sh"
)
non_sql_diffs=$(
- git diff --name-only master \
+ git diff --name-only "$target_branch" \
| grep -v -e "^sql/" -e "^bin/spark-sql" -e "^sbin/start-thriftserver.sh"
)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org