You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/03/10 20:49:51 UTC
svn commit: r635671 - in /geronimo/gbuild/daily_build_scripts: gbuild.sh
tck.sh
Author: gawor
Date: Mon Mar 10 12:49:48 2008
New Revision: 635671
URL: http://svn.apache.org/viewvc?rev=635671&view=rev
Log:
use the actual branch name in the email subject
Modified:
geronimo/gbuild/daily_build_scripts/gbuild.sh
geronimo/gbuild/daily_build_scripts/tck.sh
Modified: geronimo/gbuild/daily_build_scripts/gbuild.sh
URL: http://svn.apache.org/viewvc/geronimo/gbuild/daily_build_scripts/gbuild.sh?rev=635671&r1=635670&r2=635671&view=diff
==============================================================================
--- geronimo/gbuild/daily_build_scripts/gbuild.sh (original)
+++ geronimo/gbuild/daily_build_scripts/gbuild.sh Mon Mar 10 12:49:48 2008
@@ -81,7 +81,7 @@
if [ $count -gt 1 ]
then
echo "Previous build is still running..."
- subject="[BUILD] ${BRANCH_ID}: Previous build did not complete"
+ subject="[BUILD] ${BRANCH}: Previous build did not complete"
echo "Previous build is still running..." > mail.txt
send_mail "$subject" "$ADMIN_ADDR"
@@ -109,7 +109,7 @@
if [ $? -ne 0 ]
then
echo "SVN checkout failed."
- subject="[BUILD] ${BRANCH_ID}: SVN checkout failed"
+ subject="[BUILD] ${BRANCH}: SVN checkout failed"
echo "SVN checkout failed." > mail.txt
send_mail "$subject" "$ADMIN_ADDR"
@@ -152,10 +152,10 @@
function mail_results() {
if [ "$1" = "passed" ]
then
- subject="[BUILD] ${BRANCH_ID}: Successful"
+ subject="[BUILD] ${BRANCH}: Successful"
mailto="scm@geronimo.apache.org"
else
- subject="[BUILD] ${BRANCH_ID}: Failed for $rev"
+ subject="[BUILD] ${BRANCH}: Failed for $rev"
mailto="dev@geronimo.apache.org"
fi
Modified: geronimo/gbuild/daily_build_scripts/tck.sh
URL: http://svn.apache.org/viewvc/geronimo/gbuild/daily_build_scripts/tck.sh?rev=635671&r1=635670&r2=635671&view=diff
==============================================================================
--- geronimo/gbuild/daily_build_scripts/tck.sh (original)
+++ geronimo/gbuild/daily_build_scripts/tck.sh Mon Mar 10 12:49:48 2008
@@ -89,9 +89,9 @@
if [[ $failed != " 0" || $errors != " 0" || $ERROR != " 0" ]]
then
- subject="[Jetty $TCK_BRANCH_ID SmokeTest] $rev:$openejbrev:$tckrev - ${passed#* }/${failed#* }/${errors#* }"
+ subject="[Jetty $TCK_BRANCH SmokeTest] $rev:$openejbrev:$tckrev - ${passed#* }/${failed#* }/${errors#* }"
else
- subject="[Jetty $TCK_BRANCH_ID SmokeTest] Passed"
+ subject="[Jetty $TCK_BRANCH SmokeTest] Passed"
fi
send_mail "$subject" "geronimo-tck@geronimo.apache.org"
@@ -118,9 +118,9 @@
if [[ $failed != " 0" || $errors != " 0" || $ERROR != " 0" ]]
then
- subject="[Tomcat $TCK_BRANCH_ID SmokeTest] $rev:$openejbrev:$tckrev - ${passed#* }/${failed#* }/${errors#* }"
+ subject="[Tomcat $TCK_BRANCH SmokeTest] $rev:$openejbrev:$tckrev - ${passed#* }/${failed#* }/${errors#* }"
else
- subject="[Tomcat $TCK_BRANCH_ID SmokeTest] Passed"
+ subject="[Tomcat $TCK_BRANCH SmokeTest] Passed"
fi
send_mail "$subject" "geronimo-tck@geronimo.apache.org"
@@ -129,7 +129,7 @@
# Build failed. Mail build results.
cat $tckLog >> tck.log
- subject="[TCK $TCK_BRANCH_ID Build Failed] $rev:$tckrev"
+ subject="[TCK $TCK_BRANCH Build Failed] $rev:$tckrev"
send_mail "$subject" "geronimo-tck@geronimo.apache.org"
fi