Commit 74b792b9 authored by joreland@mysql.com's avatar joreland@mysql.com

merge

parents ff81ca1c 129b3d4a
...@@ -6,7 +6,13 @@ include $(top_srcdir)/ndb/config/type_util.mk.am ...@@ -6,7 +6,13 @@ include $(top_srcdir)/ndb/config/type_util.mk.am
include $(top_srcdir)/ndb/config/type_mgmapiclient.mk.am include $(top_srcdir)/ndb/config/type_mgmapiclient.mk.am
test_PROGRAMS = atrt test_PROGRAMS = atrt
test_DATA=daily-basic-tests.txt daily-devel-tests.txt 16node-tests.txt test_DATA=daily-basic-tests.txt daily-devel-tests.txt
test_DATA=daily-basic-tests.txt daily-devel-tests.txt 16node-tests.txt \
conf-daily-basic-ndbmaster.txt \
conf-daily-basic-shark.txt \
conf-daily-devel-ndbmaster.txt \
conf-daily-sql-ndbmaster.txt \
conf-daily-basic-dl145a.txt
test_SCRIPTS=atrt-analyze-result.sh atrt-gather-result.sh atrt-setup.sh \ test_SCRIPTS=atrt-analyze-result.sh atrt-gather-result.sh atrt-setup.sh \
atrt-clear-result.sh make-config.sh make-index.sh make-html-reports.sh atrt-clear-result.sh make-config.sh make-index.sh make-html-reports.sh
......
#!/bin/sh #!/bin/sh
save_args=$* save_args=$*
VERSION="ndb-autotest.sh version 1.01" VERSION="ndb-autotest.sh version 1.02"
DATE=`date '+%Y-%m-%d'` DATE=`date '+%Y-%m-%d'`
export DATE export DATE
...@@ -134,17 +134,13 @@ hosts=`cat /tmp/hosts.$DATE` ...@@ -134,17 +134,13 @@ hosts=`cat /tmp/hosts.$DATE`
if [ "$deploy" ] if [ "$deploy" ]
then then
(cd / && tar cfz /tmp/build.$DATE.tgz $run_dir )
for i in $hosts for i in $hosts
do do
ok=0 rsync -v -a --delete --force --ignore-errors $run_dir/ $i:$run_dir
scp /tmp/build.$DATE.tgz $i:/tmp/build.$DATE.$$.tgz && \ ok=$?
ssh $i "rm -rf /space/autotest/*" && \ if [ $ok -ne 0 ]
ssh $i "cd / && tar xfz /tmp/build.$DATE.$$.tgz" && \
ssh $i "rm /tmp/build.$DATE.$$.tgz" && ok=1
if [ $ok -eq 0 ]
then then
echo "$i failed during scp/ssh, excluding" echo "$i failed during rsync, excluding"
echo $i >> /tmp/failed.$DATE echo $i >> /tmp/failed.$DATE
fi fi
done done
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment