diff options
author | Patrick Wendell <patrick@databricks.com> | 2015-08-30 21:39:16 -0700 |
---|---|---|
committer | Patrick Wendell <patrick@databricks.com> | 2015-08-30 21:39:16 -0700 |
commit | 35e896a79bb5e72d63b82b047f46f4f6fa2e1970 (patch) | |
tree | a6884edde9192b62138fa722e9d5c758a510483f /dev/run-tests-jenkins | |
parent | 8d2ab75d3b71b632f2394f2453af32f417cb45e5 (diff) | |
download | spark-35e896a79bb5e72d63b82b047f46f4f6fa2e1970.tar.gz spark-35e896a79bb5e72d63b82b047f46f4f6fa2e1970.tar.bz2 spark-35e896a79bb5e72d63b82b047f46f4f6fa2e1970.zip |
SPARK-9545, SPARK-9547: Use Maven in PRB if title contains "[test-maven]"
This is just some small glue code to actually make use of the
AMPLAB_JENKINS_BUILD_TOOL switch. As far as I can tell, we actually
don't currently use the Maven support in the tool even though it exists.
This patch switches to Maven when the PR title contains "test-maven".
There are a few small other pieces of cleanup in the patch as well.
Author: Patrick Wendell <patrick@databricks.com>
Closes #7878 from pwendell/maven-tests.
Diffstat (limited to 'dev/run-tests-jenkins')
-rwxr-xr-x | dev/run-tests-jenkins | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/dev/run-tests-jenkins b/dev/run-tests-jenkins index 39cf54f781..3be78575e7 100755 --- a/dev/run-tests-jenkins +++ b/dev/run-tests-jenkins @@ -164,8 +164,9 @@ pr_message="" current_pr_head="`git rev-parse HEAD`" echo "HEAD: `git rev-parse HEAD`" -echo "GHPRB: $ghprbActualCommit" -echo "SHA1: $sha1" +echo "\$ghprbActualCommit: $ghprbActualCommit" +echo "\$sha1: $sha1" +echo "\$ghprbPullTitle: $ghprbPullTitle" # Run pull request tests for t in "${PR_TESTS[@]}"; do @@ -189,6 +190,19 @@ done { # Marks this build is a pull request build. export AMP_JENKINS_PRB=true + if [[ $ghprbPullTitle == *"test-maven"* ]]; then + export AMPLAB_JENKINS_BUILD_TOOL="maven" + fi + if [[ $ghprbPullTitle == *"test-hadoop1.0"* ]]; then + export AMPLAB_JENKINS_BUILD_PROFILE="hadoop1.0" + elif [[ $ghprbPullTitle == *"test-hadoop2.0"* ]]; then + export AMPLAB_JENKINS_BUILD_PROFILE="hadoop2.0" + elif [[ $ghprbPullTitle == *"test-hadoop2.2"* ]]; then + export AMPLAB_JENKINS_BUILD_PROFILE="hadoop2.2" + elif [[ $ghprbPullTitle == *"test-hadoop2.3"* ]]; then + export AMPLAB_JENKINS_BUILD_PROFILE="hadoop2.3" + fi + timeout "${TESTS_TIMEOUT}" ./dev/run-tests test_result="$?" |