You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ni...@apache.org on 2009/02/26 07:34:03 UTC
svn commit: r748036 - in /hadoop/core/trunk: CHANGES.txt build.xml
src/test/bin/test-patch.sh
Author: nigel
Date: Thu Feb 26 06:34:02 2009
New Revision: 748036
URL: http://svn.apache.org/viewvc?rev=748036&view=rev
Log:
HADOOP-5232. Enable patch testing to occur on more than one host. Contributed by Giri Kesavan.
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/build.xml
hadoop/core/trunk/src/test/bin/test-patch.sh
Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=748036&r1=748035&r2=748036&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Thu Feb 26 06:34:02 2009
@@ -137,6 +137,9 @@
HADOOP-5264. Removes redundant configuration object from the TaskTracker.
(Sharad Agarwal via ddas)
+ HADOOP-5232. Enable patch testing to occur on more than one host.
+ (Giri Kesavan via nigel)
+
OPTIMIZATIONS
BUG FIXES
Modified: hadoop/core/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/build.xml?rev=748036&r1=748035&r2=748036&view=diff
==============================================================================
--- hadoop/core/trunk/build.xml (original)
+++ hadoop/core/trunk/build.xml Thu Feb 26 06:34:02 2009
@@ -1547,6 +1547,8 @@
<arg value="${trigger.url}"/>
<arg value="${jira.passwd}"/>
<arg value="${java5.home}"/>
+ <arg value="${curl.cmd}"/>
+ <arg value="${defect}"/>
</exec>
</target>
Modified: hadoop/core/trunk/src/test/bin/test-patch.sh
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/test/bin/test-patch.sh?rev=748036&r1=748035&r2=748036&view=diff
==============================================================================
--- hadoop/core/trunk/src/test/bin/test-patch.sh (original)
+++ hadoop/core/trunk/src/test/bin/test-patch.sh Thu Feb 26 06:34:02 2009
@@ -12,8 +12,8 @@
HUDSON)
### Set HUDSON to true to indicate that this script is being run by Hudson
HUDSON=true
- if [[ $# != 17 ]] ; then
- echo "ERROR: usage $0 HUDSON <PATCH_DIR> <SUPPORT_DIR> <PS_CMD> <WGET_CMD> <JIRACLI> <SVN_CMD> <GREP_CMD> <PATCH_CMD> <FINDBUGS_HOME> <FORREST_HOME> <ECLIPSE_HOME> <PYTHON_HOME> <WORKSPACE_BASEDIR> <TRIGGER_BUILD> <JIRA_PASSWD> <JAVA5_HOME> "
+ if [[ $# != 19 ]] ; then
+ echo "ERROR: usage $0 HUDSON <PATCH_DIR> <SUPPORT_DIR> <PS_CMD> <WGET_CMD> <JIRACLI> <SVN_CMD> <GREP_CMD> <PATCH_CMD> <FINDBUGS_HOME> <FORREST_HOME> <ECLIPSE_HOME> <PYTHON_HOME> <WORKSPACE_BASEDIR> <TRIGGER_BUILD> <JIRA_PASSWD> <JAVA5_HOME> <CURL_CMD> <DEFECT> "
cleanupAndExit 0
fi
PATCH_DIR=$2
@@ -32,16 +32,19 @@
TRIGGER_BUILD_URL=${15}
JIRA_PASSWD=${16}
JAVA5_HOME=${17}
+ CURL=${18}
+ defect=${19}
+
### Retrieve the defect number
- if [ ! -e $PATCH_DIR/defectNum ] ; then
- echo "Could not determine the patch to test. Exiting."
- cleanupAndExit 0
- fi
- defect=`cat $PATCH_DIR/defectNum`
if [ -z "$defect" ] ; then
echo "Could not determine the patch to test. Exiting."
cleanupAndExit 0
fi
+
+ if [ ! -e "$PATCH_DIR" ] ; then
+ mkdir -p $PATCH_DIR
+ fi
+
ECLIPSE_PROPERTY="-Declipse.home=$ECLIPSE_HOME"
PYTHON_PROPERTY="-Dpython.home=$PYTHON_HOME"
;;
@@ -615,6 +618,8 @@
if [ -e "$PATCH_DIR" ] ; then
mv $PATCH_DIR $BASEDIR
fi
+ CALLER=`hostname`
+ $CURL $PATCH_ADMIN_URL'&CALLER='$CALLER
fi
echo ""
echo ""
@@ -646,7 +651,7 @@
if [[ $HUDSON == "true" ]] ; then
if [[ $RESULT != 0 ]] ; then
### Resubmit build.
- $WGET -q -O $PATCH_DIR/build $TRIGGER_BUILD_URL
+ $CURL $TRIGGER_BUILD_URL'&DEFECTNUM='$defect
exit 100
fi
fi