Skip to content

Commit

Permalink
[Spark QA] only check code files for new classes
Browse files Browse the repository at this point in the history
Look only at code files (`.py`, `.java`, and `.scala`) for new classes.

Should get rid of false alarms like [the one reported here](#2014 (comment)).

Author: Nicholas Chammas <[email protected]>

Closes #2184 from nchammas/jenkins-ignore-noncode and squashes the following commits:

33786ac [Nicholas Chammas] break up long line
3f91a14 [Nicholas Chammas] rename array of source files
8b82a26 [Nicholas Chammas] [Spark QA] only check code files for new classes
  • Loading branch information
nchammas authored and pwendell committed Aug 31, 2014
1 parent 9b8c228 commit c567a68
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions dev/run-tests-jenkins
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ COMMIT_URL="https://github.com/apache/spark/commit/${ghprbActualCommit}"
# GitHub doesn't auto-link short hashes when submitted via the API, unfortunately. :(
SHORT_COMMIT_HASH="${ghprbActualCommit:0:7}"

# NOTE: Jenkins will kill the whole build after 120 minutes.
# Tests are a large part of that, but not all of it.
TESTS_TIMEOUT="120m"
TESTS_TIMEOUT="120m" # format: http://linux.die.net/man/1/timeout

function post_message () {
local message=$1
Expand Down Expand Up @@ -93,9 +91,14 @@ function post_message () {
else
merge_note=" * This patch merges cleanly."

non_test_files=$(git diff master --name-only | grep -v "\/test" | tr "\n" " ")
source_files=$(
git diff master --name-only \
| grep -v -e "\/test" `# ignore files in test directories` \
| grep -e "\.py$" -e "\.java$" -e "\.scala$" `# include only code files` \
| tr "\n" " "
)
new_public_classes=$(
git diff master ${non_test_files} `# diff this patch against master and...` \
git diff master ${source_files} `# diff this patch against master and...` \
| grep "^\+" `# filter in only added lines` \
| sed -r -e "s/^\+//g" `# remove the leading +` \
| grep -e "trait " -e "class " `# filter in lines with these key words` \
Expand Down Expand Up @@ -138,7 +141,8 @@ function post_message () {
test_result="$?"

if [ "$test_result" -eq "124" ]; then
fail_message="**[Tests timed out](${BUILD_URL}consoleFull)** after a configured wait of \`${TESTS_TIMEOUT}\`."
fail_message="**[Tests timed out](${BUILD_URL}consoleFull)** after \
a configured wait of \`${TESTS_TIMEOUT}\`."
post_message "$fail_message"
exit $test_result
else
Expand Down

0 comments on commit c567a68

Please sign in to comment.