Increase retry count

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2@7049 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/experimental-all b/regress/experimental-all
index 0b920218a54d85d9f26467feec9de5f1e9f611bb..a72759be52c94b877bd0859f8c4a4293d8bd7ade 100755 (executable)
--- 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 9502ab29e43b8ab0fccff66782307278345da036..33b132bfb310fdec1df4bab7b768dbf2dc35b056 100755 (executable)
--- 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 516a2b1234bbd50f7db1fbb15d1e1e09b43aaf48..ec45086468b270e86f35c9c8c1927458f0c986b8 100755 (executable)
--- 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 0d0bdd85b9ccccaacf2fbc776593870144bcf93d..5357302e1cac3a81a5457ba04774168fa12777d9 100755 (executable)
--- 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 67d6f141420b9a65d0d557232a8e54e8fb2c42b4..284d6f5cd44847105847ecaa453a0c33ddc5885b 100755 (executable)
--- 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 5fc91bc8cb4bf6112f4429bd607748d7f3b5b9d4..8546bca612d926f2edd59694b8373cafa279bd36 100755 (executable)
--- 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 7668d955cbc395799154f311da8764be0bf677c5..5a1775edc1f65a445cc1fcfbd13335569a03c0c3 100755 (executable)
--- 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 0d7268e39610fcd794b594d68258b4302c4b77d4..4d47c048a93403ef4234740b73ba2e8181bd906a 100755 (executable)
--- 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`"