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/01/11 22:47:39 UTC
svn commit: r611310 - in /geronimo/gbuild/daily_build_scripts: gbuild.sh
tck.sh testsuite.sh
Author: gawor
Date: Fri Jan 11 13:47:36 2008
New Revision: 611310
URL: http://svn.apache.org/viewvc?rev=611310&view=rev
Log:
reduce the number of user-specific references from build scripts
Modified:
geronimo/gbuild/daily_build_scripts/gbuild.sh
geronimo/gbuild/daily_build_scripts/tck.sh
geronimo/gbuild/daily_build_scripts/testsuite.sh
Modified: geronimo/gbuild/daily_build_scripts/gbuild.sh
URL: http://svn.apache.org/viewvc/geronimo/gbuild/daily_build_scripts/gbuild.sh?rev=611310&r1=611309&r2=611310&view=diff
==============================================================================
--- geronimo/gbuild/daily_build_scripts/gbuild.sh (original)
+++ geronimo/gbuild/daily_build_scripts/gbuild.sh Fri Jan 11 13:47:36 2008
@@ -33,6 +33,10 @@
M2_REPO=$BASE_DIR/.m2/repository
ADMIN_ADDR="prasad@apache.org gawor@apache.org"
+REMOTE_ACCOUNT=prasad
+REMOTE_HOME=/home/prasad
+REMOTE_MACHINE=people.apache.org
+
MVN_HOME=/usr/local/maven
JAVA_HOME=/usr/local/java
JRE_HOME=/usr/lib/jvm/jre
@@ -61,9 +65,9 @@
mailto=$2
mail_ts=`date +%Y%m%d%H%M%S`
- remote_mail_file=/home/prasad/${mail_ts}.mail.txt
- scp mail.txt prasad@people:$remote_mail_file
- ssh prasad@people "mail -s '$subject' $mailto < $remote_mail_file; rm -f $remote_mail_file"
+ remote_mail_file=${REMOTE_HOME}/${mail_ts}.mail.txt
+ scp mail.txt ${REMOTE_ACCOUNT}@${REMOTE_MACHINE}:$remote_mail_file
+ ssh ${REMOTE_ACCOUNT}@${REMOTE_MACHINE} "mail -s '$subject' $mailto < $remote_mail_file; rm -f $remote_mail_file"
}
@@ -86,8 +90,8 @@
log=build-$ts.log
dir=`date +%F | awk -F- '{print $1$2$3}'`
-bin_dir=/home/prasad/public_html/binaries/$BRANCH_DIR/$dir
-ssh prasad@people mkdir $bin_dir
+bin_dir=${REMOTE_HOME}/public_html/binaries/$BRANCH_DIR/$dir
+ssh ${REMOTE_ACCOUNT}@${REMOTE_MACHINE} mkdir $bin_dir
rm -rf $M2_REPO
@@ -152,7 +156,7 @@
}
build $SKIP_TESTS
-scp $log prasad@people:$bin_dir
+scp $log ${REMOTE_ACCOUNT}@${REMOTE_MACHINE}:$bin_dir
if [ "$SKIP_TESTS" = "true" ]
then
@@ -162,13 +166,13 @@
fi
echo " " >> mail.txt
-echo "See the full $log file at http://people.apache.org/~prasad/binaries/$BRANCH_DIR/$dir/$log" >> mail.txt
+echo "See the full $log file at http://people.apache.org/~${REMOTE_ACCOUNT}/binaries/$BRANCH_DIR/$dir/$log" >> mail.txt
echo " " >> mail.txt
grep "BUILD SUCCESSFUL" $log
if [ $? -eq 0 ]
then
- echo "Download the binaries from http://people.apache.org/~prasad/binaries/$BRANCH_DIR/$dir" >> mail.txt
+ echo "Download the binaries from http://people.apache.org/~${REMOTE_ACCOUNT}/binaries/$BRANCH_DIR/$dir" >> mail.txt
result="passed"
grep -A10 "BUILD SUCCESSFUL" $log >> mail.txt
@@ -176,7 +180,7 @@
cd $TEST_DIR/$BRANCH_DIR/assemblies
for i in `find . -name *ee5*.zip`
do
- scp $i prasad@people:$bin_dir
+ scp $i ${REMOTE_ACCOUNT}@${REMOTE_MACHINE}:$bin_dir
done
cd ..
Modified: geronimo/gbuild/daily_build_scripts/tck.sh
URL: http://svn.apache.org/viewvc/geronimo/gbuild/daily_build_scripts/tck.sh?rev=611310&r1=611309&r2=611310&view=diff
==============================================================================
--- geronimo/gbuild/daily_build_scripts/tck.sh (original)
+++ geronimo/gbuild/daily_build_scripts/tck.sh Fri Jan 11 13:47:36 2008
@@ -35,13 +35,13 @@
mailto=$2
mail_ts=`date +%Y%m%d%H%M%S`
- remote_mail_file=/home/prasad/${mail_ts}.tck.log
- scp tck.log prasad@people:$remote_mail_file
- ssh prasad@people "mail -s '$subject' $mailto < $remote_mail_file; rm -f $remote_mail_file"
+ remote_mail_file=${REMOTE_HOME}/${mail_ts}.tck.log
+ scp tck.log ${REMOTE_ACCOUNT}@${REMOTE_MACHINE}:$remote_mail_file
+ ssh ${REMOTE_ACCOUNT}@${REMOTE_MACHINE} "mail -s '$subject' $mailto < $remote_mail_file; rm -f $remote_mail_file"
}
-cd /home/prasad/geronimo
+cd $TEST_DIR
rm -rf tck
svn co https://svn.apache.org/repos/tck/geronimo-tck/porting/branches/$1 tck
Modified: geronimo/gbuild/daily_build_scripts/testsuite.sh
URL: http://svn.apache.org/viewvc/geronimo/gbuild/daily_build_scripts/testsuite.sh?rev=611310&r1=611309&r2=611310&view=diff
==============================================================================
--- geronimo/gbuild/daily_build_scripts/testsuite.sh (original)
+++ geronimo/gbuild/daily_build_scripts/testsuite.sh Fri Jan 11 13:47:36 2008
@@ -30,7 +30,7 @@
BRANCH_ID=$1
BRANCH_DIR=$2
-BRANCH_TEST_DIR=/home/prasad/geronimo/$BRANCH_DIR
+BRANCH_TEST_DIR=$TEST_DIR/$BRANCH_DIR
MAIL_FILE=$BRANCH_TEST_DIR/mail.txt
function createLogsDir() {
@@ -60,12 +60,12 @@
createLogsDir geronimo.log
- scp -r $LOG_DIR prasad@people:$bin_dir
+ scp -r $LOG_DIR ${REMOTE_ACCOUNT}@${REMOTE_MACHINE}:$bin_dir
echo " " >> $MAIL_FILE
echo "Assembly: $CONTAINER" >> $MAIL_FILE
echo "=================================" >> $MAIL_FILE
- echo "See the full test.log file at http://people.apache.org/~prasad/binaries/$BRANCH_DIR/$dir/$LOG_DIR_NAME/test.log" >> $MAIL_FILE
+ echo "See the full test.log file at http://people.apache.org/~${REMOTE_ACCOUNT}/binaries/$BRANCH_DIR/$dir/$LOG_DIR_NAME/test.log" >> $MAIL_FILE
echo " " >> $MAIL_FILE
grep -E "Running|FAILURE!" $testLog | grep -B1 "FAILURE!" >> $MAIL_FILE
@@ -93,7 +93,7 @@
echo " " >> $MAIL_FILE
echo "TESTSUITE RESULTS (Failures only)" >> $MAIL_FILE
echo "=================================" >> $MAIL_FILE
-echo "See detailed results at http://people.apache.org/~prasad/testsuite/ResultsSummary.html" >> $MAIL_FILE
+echo "See detailed results at http://people.apache.org/~${REMOTE_ACCOUNT}/testsuite/ResultsSummary.html" >> $MAIL_FILE
runTests tomcat test-jetty