diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh index 3cea7c4cb7..76b020a01e 100755 --- a/dev-support/test-patch.sh +++ b/dev-support/test-patch.sh @@ -566,8 +566,10 @@ checkFindbugsWarnings () { $FINDBUGS_HOME/bin/convertXmlToText -html \ $PATCH_DIR/newPatchFindbugsWarnings${module_suffix}.xml \ $PATCH_DIR/newPatchFindbugsWarnings${module_suffix}.html - JIRA_COMMENT_FOOTER="Findbugs warnings: $BUILD_URL/artifact/trunk/patchprocess/newPatchFindbugsWarnings${module_suffix}.html + if [[ $newFindbugsWarnings > 0 ]] ; then + JIRA_COMMENT_FOOTER="Findbugs warnings: $BUILD_URL/artifact/trunk/$(basename $BASEDIR)/patchprocess/newPatchFindbugsWarnings${module_suffix}.html $JIRA_COMMENT_FOOTER" + fi done ### if current warnings greater than OK_FINDBUGS_WARNINGS diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index cd3ef0ec46..8529aab678 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -15,6 +15,10 @@ Trunk (unreleased changes) MAPREDUCE-2784. [Gridmix] Bug fixes in ExecutionSummarizer and ResourceUsageMatcher. (amarrk) + MAPREDUCE-2978. Fixed test-patch to make Jenkins report correct number of + findBugs, correct links to findBugs artifacts and no links to the + artifacts when there are no warnings. (Tom White via vinodkv). + Release 0.23.0 - Unreleased INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/dev-support/test-patch.properties b/hadoop-mapreduce-project/dev-support/test-patch.properties index 4d6032d4c5..c59f3895ee 100644 --- a/hadoop-mapreduce-project/dev-support/test-patch.properties +++ b/hadoop-mapreduce-project/dev-support/test-patch.properties @@ -14,5 +14,5 @@ # limitations under the License. OK_RELEASEAUDIT_WARNINGS=2 -OK_FINDBUGS_WARNINGS=13 +OK_FINDBUGS_WARNINGS=0 OK_JAVADOC_WARNINGS=0