From 584a2ba21cd176af0c7b6eb51acf5f2ffe0d332c Mon Sep 17 00:00:00 2001
From: Andrew Or <andrew@databricks.com>
Date: Wed, 3 Jun 2015 18:09:14 -0700
Subject: [PATCH] [BUILD] Use right branch when checking against Hive (1.4)
For branch-1.4.
This is identical to #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 <andrew@databricks.com>
Closes #6630 from andrewor14/build-check-hive-1.4 and squashes the following commits:
186ec65 [Andrew Or] [BUILD] Use right branch when checking against Hive
---
dev/run-tests | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dev/run-tests b/dev/run-tests
index ba1eee6366..d38b4e150c 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"
)
--
GitLab