svn commit: r748422 - in /hadoop/core/nightly: hudsonPatchQueueAdmin.sh processHadoopPatchEmail.sh

[ni...@apache.org]

Author: nigel
Date: Fri Feb 27 08:05:23 2009
New Revision: 748422

URL: http://svn.apache.org/viewvc?rev=748422&view=rev
Log:
updated nightly scripts for test patch admin

Modified:
    hadoop/core/nightly/hudsonPatchQueueAdmin.sh
    hadoop/core/nightly/processHadoopPatchEmail.sh

Modified: hadoop/core/nightly/hudsonPatchQueueAdmin.sh
URL: http://svn.apache.org/viewvc/hadoop/core/nightly/hudsonPatchQueueAdmin.sh?rev=748422&r1=748421&r2=748422&view=diff
==============================================================================
--- hadoop/core/nightly/hudsonPatchQueueAdmin.sh (original)
+++ hadoop/core/nightly/hudsonPatchQueueAdmin.sh Fri Feb 27 08:05:23 2009
@@ -13,6 +13,7 @@
    -s      Build Server Names
    -c      Called by values like USER OR Build Server name
    -t      Path to curl binary
+   -S      Path to sed binary
    -u      Build url token
    -q      Path to the Queue Directory
 		### The directory to accumulate the patch queue.  Must be
@@ -28,8 +29,9 @@
 CURL=
 BUILD_URL_TOKEN=
 VERBOSE=
+SED= 
 
-while getopts "hp:s:c:t:u:q:v" OPTION
+while getopts "hp:s:c:t:u:q:S:v" OPTION
 do
      case $OPTION in
          h)
@@ -48,6 +50,9 @@
          t)
              CURL=$OPTARG
              ;;
+         S)
+             SED=$OPTARG
+             ;;
          u)
              BUILD_URL_TOKEN=$OPTARG
              ;;
@@ -64,7 +69,7 @@
      esac
 done
 
-if [[ -z $PROJECT ]] || [[ -z $BUILD_SERVERS ]] || [[ -z $CALLED_BY ]] || [[ -z $CURL ]] || [[ -z $BUILD_URL_TOKEN ]] || [[ -z $QUEUE_DIR ]]
+if [[ -z $PROJECT ]] || [[ -z $BUILD_SERVERS ]] || [[ -z $CALLED_BY ]] || [[ -z $SED ]] || [[ -z $CURL ]] || [[ -z $BUILD_URL_TOKEN ]] || [[ -z $QUEUE_DIR ]]
 then
      usage
      exit 1
@@ -78,8 +83,8 @@
 
 ### To check if this patch_admin job called by test-patch.sh or hudson
 ### if called by test-patch.sh then freee up the slae machine.
-if [[ $CALLEDBY != "" && $CALLEDBY != "USER" ]]; then
-  rm -rf ${QUEUE_DIR}/${CALLEDBY}
+if [[ $CALLED_BY != "" && $CALLED_BY != "USER" ]]; then
+  rm -rf ${QUEUE_DIR}/${CALLED_BY}
 fi
 
 QUEUE_HTML_FILE=`pwd`/${PROJECT}_PatchQueue.html
@@ -99,18 +104,17 @@
 if [[ ! -f $CURRENT_PATCH ]]; then
   if [[ $defect ]]; then
     echo $defect > ${CURRENT_PATCH}
-      sed -i '1d' $PATCH_QUEUE
+      $SED -i '1d' $PATCH_QUEUE
       echo "$defect patch submitted for testing at `date +"%b %a %H:%M"`"
-      echo "$CURL $TRIGGER_BUILD_URL&DEFECTNUM=$defect"
       $CURL "$TRIGGER_BUILD_URL&DEFECTNUM=$defect"
-      echo "<tr><td><a href=\"http://issues.apache.org/jira/browse/${defect}\">$defect</a></td><td>${SLAVE}</td><td>`date +"%b %a %H:%M"` UTC</td></tr>" >> $QUEUE_HTML_FILE	
+      echo "<tr><td><a href=\"http://issues.apache.org/jira/browse/${defect}\">$defect</a></td><td>${SLAVE}</td><td>`date +"%b %a %H:%M"` EST</td></tr>" >> $QUEUE_HTML_FILE	
   else
     CURRENT_PATCH="none"
     CURRENT_PATCH_TIME="-"
     echo "<tr><td>$CURRENT_PATCH</td><td>$CURRENT_PATCH_TIME</td></tr>" >> $QUEUE_HTML_FILE
   fi
 else
-  CURRENT_PATCH_TIME=`/bin/ls -dtl ${CURRENT_PATCH} | awk '{print $6" "$7" "$8" UTC"}'`
+  CURRENT_PATCH_TIME=`/bin/ls -dtl ${CURRENT_PATCH} | awk '{print $6" "$7" "$8" EST"}'`
   EXEC_PATCH=`cat ${CURRENT_PATCH}`
   echo "<tr><td><a href=\"http://issues.apache.org/jira/browse/$EXEC_PATCH\">$EXEC_PATCH</a></td><td>${SLAVE}</td><td>$CURRENT_PATCH_TIME</td></tr>" >> $QUEUE_HTML_FILE
 fi
@@ -123,7 +127,7 @@
 if [ -s $PATCH_QUEUE ]; then
   while read PATCH_DTLS
   do 
-  TEMP_QUEUE_DTLS=`echo $PATCH_DTLS | awk '{print "<tr><td><a href=\"http://issues.apache.org/jira/browse/"$1"\">"$1"</a></td><td>"$2" "$3" "$4" "$5" UTC</td></tr>"}'` 
+  TEMP_QUEUE_DTLS=`echo $PATCH_DTLS | awk '{print "<tr><td><a href=\"http://issues.apache.org/jira/browse/"$1"\">"$1"</a></td><td>"$2" "$3" "$4" "$5" EST</td></tr>"}'` 
   echo $TEMP_QUEUE_DTLS >> $QUEUE_HTML_FILE  
   done < "$PATCH_QUEUE"
 else 

Modified: hadoop/core/nightly/processHadoopPatchEmail.sh
URL: http://svn.apache.org/viewvc/hadoop/core/nightly/processHadoopPatchEmail.sh?rev=748422&r1=748421&r2=748422&view=diff
==============================================================================
--- hadoop/core/nightly/processHadoopPatchEmail.sh (original)
+++ hadoop/core/nightly/processHadoopPatchEmail.sh Fri Feb 27 08:05:23 2009
@@ -37,7 +37,7 @@
   done < $PATCH_QUEUE
   ### Append the defect # to the patch queue if defect # not in patch queue already
   if [[ -z $duplicate ]]; then
-    echo "$defect is being processed at `date`"
+    echo "$defect is being processed at `date`" >> $LOG
     echo $defect `date` >> $PATCH_QUEUE
     chmod -R a+w $QUEUE_DIR
   fi