Skip to content

Commit

Permalink
[BUILD] Use right branch when checking against Hive (1.4)
Browse files Browse the repository at this point in the history
For branch-1.4.

This is identical to apache#6629 and is strictly not necessary. I'm opening this as a PR since it changes Jenkins test behavior and I want to test it out here.

Author: Andrew Or <[email protected]>

Closes apache#6630 from andrewor14/build-check-hive-1.4 and squashes the following commits:

186ec65 [Andrew Or] [BUILD] Use right branch when checking against Hive
  • Loading branch information
Andrew Or committed Jun 4, 2015
1 parent 96f71b1 commit 584a2ba
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions dev/run-tests
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down

0 comments on commit 584a2ba

Please sign in to comment.