Repository: hadoop Updated Branches: refs/heads/trunk f71eb51ab -> 82707b441
HADOOP-11352 Clean up test-patch.sh to disable "+1 contrib tests" Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/82707b44 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/82707b44 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/82707b44 Branch: refs/heads/trunk Commit: 82707b44196d63150a8668fa97aa824344b3f9a0 Parents: f71eb51 Author: Steve Loughran <ste...@apache.org> Authored: Tue Dec 9 11:32:51 2014 +0000 Committer: Steve Loughran <ste...@apache.org> Committed: Tue Dec 9 11:32:51 2014 +0000 ---------------------------------------------------------------------- dev-support/test-patch.sh | 71 -------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 + 2 files changed, 3 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/82707b44/dev-support/test-patch.sh ---------------------------------------------------------------------- diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh index e6512ab..ece3ddf 100755 --- a/dev-support/test-patch.sh +++ b/dev-support/test-patch.sh @@ -858,74 +858,6 @@ findModules () { echo $CHANGED_MODULES } ############################################################################### -### Run the test-contrib target -runContribTests () { - echo "" - echo "" - echo "======================================================================" - echo "======================================================================" - echo " Running contrib tests." - echo "======================================================================" - echo "======================================================================" - echo "" - echo "" - - if [[ `$GREP -c 'test-contrib' build.xml` == 0 ]] ; then - echo "No contrib tests in this project." - return 0 - fi - - ### Kill any rogue build processes from the last attempt - $PS auxwww | $GREP ${PROJECT_NAME}PatchProcess | $AWK '{print $2}' | /usr/bin/xargs -t -I {} /bin/kill -9 {} > /dev/null - - #echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" $ECLIPSE_PROPERTY -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=no test-contrib" - #$ANT_HOME/bin/ant -Dversion="${VERSION}" $ECLIPSE_PROPERTY -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=no test-contrib - echo "NOP" - if [[ $? != 0 ]] ; then - JIRA_COMMENT="$JIRA_COMMENT - - {color:red}-1 contrib tests{color}. The patch failed contrib unit tests." - return 1 - fi - JIRA_COMMENT="$JIRA_COMMENT - - {color:green}+1 contrib tests{color}. The patch passed contrib unit tests." - return 0 -} - -############################################################################### -### Run the inject-system-faults target -checkInjectSystemFaults () { - echo "" - echo "" - echo "======================================================================" - echo "======================================================================" - echo " Checking the integrity of system test framework code." - echo "======================================================================" - echo "======================================================================" - echo "" - echo "" - - ### Kill any rogue build processes from the last attempt - $PS auxwww | $GREP ${PROJECT_NAME}PatchProcess | $AWK '{print $2}' | /usr/bin/xargs -t -I {} /bin/kill -9 {} > /dev/null - - #echo "$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=no -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME inject-system-faults" - #$ANT_HOME/bin/ant -Dversion="${VERSION}" -DHadoopPatchProcess= -Dtest.junit.output.format=xml -Dtest.output=no -Dcompile.c++=yes -Dforrest.home=$FORREST_HOME inject-system-faults - echo "NOP" - return 0 - if [[ $? != 0 ]] ; then - JIRA_COMMENT="$JIRA_COMMENT - - {color:red}-1 system test framework{color}. The patch failed system test framework compile." - return 1 - fi - JIRA_COMMENT="$JIRA_COMMENT - - {color:green}+1 system test framework{color}. The patch passed system test framework compile." - return 0 -} - -############################################################################### ### Submit a comment to the defect's Jira submitJiraComment () { local result=$1 @@ -1059,10 +991,7 @@ checkReleaseAuditWarnings if [[ $JENKINS == "true" || $RUN_TESTS == "true" ]] ; then runTests (( RESULT = RESULT + $? )) - runContribTests - (( RESULT = RESULT + $? )) fi -checkInjectSystemFaults (( RESULT = RESULT + $? )) JIRA_COMMENT_FOOTER="Test results: $BUILD_URL/testReport/ $JIRA_COMMENT_FOOTER" http://git-wip-us.apache.org/repos/asf/hadoop/blob/82707b44/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index b5178c3..cf3e531 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -148,6 +148,9 @@ Trunk (Unreleased) HADOOP-11081. Document hadoop properties expected to be set by the shell code in *-env.sh (aw) + HADOOP-11352 Clean up test-patch.sh to disable "+1 contrib tests" + (Akira AJISAKA via stevel) + BUG FIXES HADOOP-9451. Fault single-layer config if node group topology is enabled.