diff options
author | Andrew Or <andrew@databricks.com> | 2015-06-03 18:08:53 -0700 |
---|---|---|
committer | Andrew Or <andrew@databricks.com> | 2015-06-03 18:08:53 -0700 |
commit | 9cf740f357fef00b5251618b20501774852f8a28 (patch) | |
tree | 8ffeeb7750dac8ec0fce4640e6bd10a072cebbaf /dev/run-tests | |
parent | e35cd36e08faa43466759c412c420a9d8901d368 (diff) | |
download | spark-9cf740f357fef00b5251618b20501774852f8a28.tar.gz spark-9cf740f357fef00b5251618b20501774852f8a28.tar.bz2 spark-9cf740f357fef00b5251618b20501774852f8a28.zip |
[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 <andrew@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
Diffstat (limited to 'dev/run-tests')
-rwxr-xr-x | dev/run-tests | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/dev/run-tests b/dev/run-tests index 7dd8d31fd4..d178e2a460 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" ) |