From: Kern Sibbald Date: Wed, 28 May 2008 19:10:46 +0000 (+0000) Subject: Increase retry count X-Git-Tag: Release-3.0.0~1375 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8d2bec5e6172b812f33db5488376725ff00d1dd2;p=bacula%2Fbacula Increase retry count git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7048 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/regress/experimental-all b/regress/experimental-all index 0b920218a5..a72759be52 100755 --- a/regress/experimental-all +++ b/regress/experimental-all @@ -10,15 +10,18 @@ export REGRESS_DEBUG svn update scripts/config_dart nice ctest -D Experimental -R "^(disk|tape|changer):" -if [ $? != 0 ] ; then +rtn=$? +i=0 +while [ $i -le 5 ]; do + if [ $rtn = 0 ] ; then + break; + fi + echo "Submit failed, waiting 5 mins" + sleep 300 echo "ctest failed re-running Submit" ctest -D ExperimentalSubmit - if [ $? != 0 ] ; then - echo "Submit failed, waiting 5 mins" - sleep 300 - echo "ctest failed re-running Submit a second time" - ctest -D ExperimentalSubmit - fi -fi + rtn=$? + i=`expr $i + 1` +done REGRESS_DEBUG=${save_debug} echo "End experimental-all `date`" diff --git a/regress/experimental-disk b/regress/experimental-disk index 9502ab29e4..33b132bfb3 100755 --- a/regress/experimental-disk +++ b/regress/experimental-disk @@ -10,15 +10,18 @@ export REGRESS_DEBUG svn update scripts/config_dart nice ctest -D Experimental -R "^disk:" -if [ $? != 0 ] ; then +rtn=$? +i=0 +while [ $i -le 5 ]; do + if [ $rtn = 0 ] ; then + break; + fi + echo "Submit failed, waiting 5 mins" + sleep 300 echo "ctest failed re-running Submit" ctest -D ExperimentalSubmit - if [ $? != 0 ] ; then - echo "Submit failed, waiting 5 mins" - sleep 300 - echo "ctest failed re-running Submit a second time" - ctest -D ExperimentalSubmit - fi -fi + rtn=$? + i=`expr $i + 1` +done REGRESS_DEBUG=${save_debug} echo "End experimental-disk `date`" diff --git a/regress/experimental-disk-and-tape b/regress/experimental-disk-and-tape index 516a2b1234..ec45086468 100755 --- a/regress/experimental-disk-and-tape +++ b/regress/experimental-disk-and-tape @@ -10,15 +10,18 @@ export REGRESS_DEBUG svn update scripts/config_dart nice ctest -D Experimental -R "^(disk|tape):" -if [ $? != 0 ] ; then +rtn=$? +i=0 +while [ $i -le 5 ]; do + if [ $rtn = 0 ] ; then + break; + fi + echo "Submit failed, waiting 5 mins" + sleep 300 echo "ctest failed re-running Submit" ctest -D ExperimentalSubmit - if [ $? != 0 ] ; then - echo "Submit failed, waiting 5 mins" - sleep 300 - echo "ctest failed re-running Submit a second time" - ctest -D ExperimentalSubmit - fi -fi + rtn=$? + i=`expr $i + 1` +done REGRESS_DEBUG=${save_debug} echo "End experimental-disk-and-tape `date`" diff --git a/regress/experimental-tape b/regress/experimental-tape index 0d0bdd85b9..5357302e1c 100755 --- a/regress/experimental-tape +++ b/regress/experimental-tape @@ -10,15 +10,18 @@ export REGRESS_DEBUG svn update scripts/config_dart nice ctest -D Experimental -R "^tape:" -if [ $? != 0 ] ; then +rtn=$? +i=0 +while [ $i -le 5 ]; do + if [ $rtn = 0 ] ; then + break; + fi + echo "Submit failed, waiting 5 mins" + sleep 300 echo "ctest failed re-running Submit" ctest -D ExperimentalSubmit - if [ $? != 0 ] ; then - echo "Submit failed, waiting 5 mins" - sleep 300 - echo "ctest failed re-running Submit a second time" - ctest -D ExperimentalSubmit - fi -fi + rtn=$? + i=`expr $i + 1` +done REGRESS_DEBUG=${save_debug} echo "End experimental-tape `date`" diff --git a/regress/nightly-all b/regress/nightly-all index 67d6f14142..284d6f5cd4 100755 --- a/regress/nightly-all +++ b/regress/nightly-all @@ -10,15 +10,18 @@ export REGRESS_DEBUG svn update scripts/config_dart nice ctest -D Nightly -R "^(disk|tape|changer):" -if [ $? != 0 ] ; then +rtn=$? +i=0 +while [ $i -le 5 ]; do + if [ $rtn = 0 ] ; then + break; + fi + echo "Submit failed, waiting 5 mins" + sleep 300 echo "ctest failed re-running Submit" ctest -D NightlySubmit - if [ $? != 0 ] ; then - echo "Submit failed, waiting 5 mins" - sleep 300 - echo "ctest failed re-running Submit a second time" - ctest -D NightlySubmit - fi -fi + rtn=$? + i=`expr $i + 1` +done REGRESS_DEBUG=${save_debug} echo "End nightly-all `date`" diff --git a/regress/nightly-disk b/regress/nightly-disk index 5fc91bc8cb..8546bca612 100755 --- a/regress/nightly-disk +++ b/regress/nightly-disk @@ -10,15 +10,18 @@ export REGRESS_DEBUG svn update scripts/config_dart nice ctest -D Nightly -R "^disk:" -if [ $? != 0 ] ; then +rtn=$? +i=0 +while [ $i -le 5 ]; do + if [ $rtn = 0 ] ; then + break; + fi + echo "Submit failed, waiting 5 mins" + sleep 300 echo "ctest failed re-running Submit" ctest -D NightlySubmit - if [ $? != 0 ] ; then - echo "Submit failed, waiting 5 mins" - sleep 300 - echo "ctest failed re-running Submit a second time" - ctest -D NightlySubmit - fi -fi + rtn=$? + i=`expr $i + 1` +done REGRESS_DEBUG=${save_debug} echo "End nightly-disk `date`" diff --git a/regress/nightly-disk-and-tape b/regress/nightly-disk-and-tape index 7668d955cb..5a1775edc1 100755 --- a/regress/nightly-disk-and-tape +++ b/regress/nightly-disk-and-tape @@ -10,15 +10,18 @@ export REGRESS_DEBUG svn update scripts/config_dart nice ctest -D Experimental -R "^(disk|tape):" -if [ $? != 0 ] ; then - echo "ctest failed re-running Submit" - ctest -D ExperimentalSubmit - if [ $? != 0 ] ; then - echo "Submit failed, waiting 5 mins" - sleep 300 - echo "ctest failed re-running Submit a second time" - ctest -D NightlySubmit +rtn=$? +i=0 +while [ $i -le 5 ]; do + if [ $rtn = 0 ] ; then + break; fi -fi + echo "Submit failed, waiting 5 mins" + sleep 300 + echo "ctest failed re-running Submit" + ctest -D NightlySubmit + rtn=$? + i=`expr $i + 1` +done REGRESS_DEBUG=${save_debug} echo "End nightly-disk-and-tape `date`" diff --git a/regress/nightly-tape b/regress/nightly-tape index 0d7268e396..4d47c048a9 100755 --- a/regress/nightly-tape +++ b/regress/nightly-tape @@ -10,15 +10,18 @@ export REGRESS_DEBUG svn update scripts/config_dart nice ctest -D Nightly -R "^tape:" -if [ $? != 0 ] ; then +rtn=$? +i=0 +while [ $i -le 5 ]; do + if [ $rtn = 0 ] ; then + break; + fi + echo "Submit failed, waiting 5 mins" + sleep 300 echo "ctest failed re-running Submit" ctest -D NightlySubmit - if [ $? != 0 ] ; then - echo "Submit failed, waiting 5 mins" - sleep 300 - echo "ctest failed re-running Submit a second time" - ctest -D NightlySubmit - fi -fi + rtn=$? + i=`expr $i + 1` +done REGRESS_DEBUG=${save_debug} echo "End nightly-tape `date`"