Bug 387066 - Remove Red X's (and the few green checkmarks) from main DL

page

Add comparator log to mail message.

1 files changed, 22 insertions, 19 deletions

diff --git a/production/sdk/promotion/syncDropLocation.sh b/production/sdk/promotion/syncDropLocation.sh
index b003331b9..f9b939669 100755
--- a/production/sdk/promotion/syncDropLocation.sh
+++ b/production/sdk/promotion/syncDropLocation.sh
@@ -136,40 +136,43 @@ function sendPromoteMail ()
   #we could? to "fix up" TODIR since it's in file form, not URL
   # URLTODIR=${TODIR##*${DOWNLOAD_ROOT}}
 
-  message1=""
+  message1="$message1 <p>Eclipse downloads: <br />\n&nbsp;&nbsp;&nbsp;${downloadURL}</p>\n"
 
-  #TODO: later can use sed, form a proper list
-  if [[ -n "${POM_UPDATES}" ]]
-  then
-    message1="$message1 <p>POM Update Required: ${downloadURL}pom_updates/</p>\n"
-  fi
-
-  message1="$message1 <p>Eclipse downloads: ${downloadURL}</p>\n"
-
-  message1="$message1 <p>&nbsp;&nbsp;&nbsp;Build logs and/or test results (eventually): ${downloadURL}testResults.php</p>\n"
+  message1="$message1 <p>&nbsp;&nbsp;&nbsp;Build logs and/or test results (eventually): <br />\n&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${downloadURL}testResults.php</p>\n"
 
   if [[ $logSize -gt  ${comparatorLogMinimumSize} ]]
   then
-     message1="$message1 <p>&nbsp;&nbsp;&nbsp;Check unanticipated comparator messages  ${downloadURL}${comparatorLogRelPath}<p>\n"
+     message1="$message1 <p>&nbsp;&nbsp;&nbsp;Check unanticipated comparator messages:  <br />\n&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${downloadURL}${comparatorLogRelPath}<p>\n"
   else 
-     echo -e "DEBUG: logSize of $logSize was not greater than comparatorLogMinimumSize of ${comparatorLogMinimumSize}"
+     echo -e "DEBUG: comparator logSize of $logSize was not greater than comparatorLogMinimumSize of ${comparatorLogMinimumSize}"
   fi
-  
-  
 
   # Do not include repo, if build failed
   if [[ -z "${BUILD_FAILED}" ]]
   then
-    message1="$message1 <p>Software site repository: http://${SITE_HOST}/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds</p>\n"
+    message1="$message1 <p>Software site repository: <br />\n&nbsp;&nbsp;&nbsp;http://${SITE_HOST}/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds</p>\n"
+    message1="$message1 <p>Specific (simple) site repository: <br />\n&nbsp;&nbsp;&nbsp;http://${SITE_HOST}/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds/${buildId}</p>\n"
   fi
 
   # Do not include Equinox, if build failed, or if patch or experimental build
   if [[ -z "${BUILD_FAILED}" && ! "${buildId}" =~ [PYX]  ]]
   then
-    message1="$message1 <p>Equinox downloads: http://${SITE_HOST}/equinox/drops/${buildId}</p>\n"
+    message1="$message1 <p>Equinox downloads: <br />\n&nbsp;&nbsp;&nbsp;http://${SITE_HOST}/equinox/drops/${buildId}</p>\n"
+  fi
+
+  if [[ -n "${POM_UPDATES}" ]]
+  then
+    message1="$message1 <p>POM Update Required (patches below): <br />\n&nbsp;&nbsp;&nbsp;${downloadURL}pom_updates/</p>\n"
+    for file in ${fsDocRoot}/${mainPath}/${buildId}/pom_updates/
+    do
+       echo "DEBUG: pom update file: $file"
+       message1="message1 <p>$( cat $file)</p>"
+    done
+    
   fi
 
-  if [[ "${BUILD_KIND}" == "CBI" && "${buildId}" =~ [NMI] ]]
+
+  if [[ "${BUILD_KIND}" == "CBI" && ${buildType} =~ [NMI] ]]
   then
     (
     echo "To: ${TO}"
@@ -181,7 +184,7 @@ function sendPromoteMail ()
     echo -e "${message1}"
     echo "</body></html>"
     ) | /usr/lib/sendmail -t
-  elif [[ "${BUILD_KIND}" == "CBI" && "${buildId}" =~ [PYX] ]]
+  elif [[ "${BUILD_KIND}" == "CBI" && ${buildType} =~ [PYX] ]]
   then
     (
     echo "To: ${TO}"
@@ -194,7 +197,7 @@ function sendPromoteMail ()
     echo "</body></html>"
     ) | /usr/lib/sendmail -t
   fi
-  echo "mail sent for $eclipseStream $buildType-build $buildId"
+  echo "INFO: mail sent for $eclipseStream $buildType-build $buildId"
   return 0
 }