Merge branch 'master' of ssh://git.onelab.eu/git/tests

diff --git a/system/lxc-driver.sh b/system/lxc-driver.sh
index fa73cad..ae4debd 100755 (executable)
--- a/system/lxc-driver.sh
+++ b/system/lxc-driver.sh
@@ -11,7 +11,6 @@ function start_all () {
 
     for i in $(lxc-ls -1|sort|uniq); do 
         [ "$(lxc-info -n $i | grep state| awk '{print $2;}' )" != "RUNNING" ] && lxc-start -d -n $i || :
-       lxc-wait -n $i -s RUNNING
     done
    
     #sense_all
@@ -21,10 +20,9 @@ function stop_all () {
    
     for i in $(lxc-ls -1|sort|uniq); do
         [ "$(lxc-info -n $i | grep state| awk '{print $2;}' )" != "STOPPED" ] && lxc-stop -n $i
-        lxc-wait -n $i -s STOPPED
     done
     
-    sense_all
+    #sense_all
 }
 
 function sense_lxc () {
@@ -37,18 +35,16 @@ function start_lxc () {
 
     lxc=$1; shift
     [ "$(lxc-info -n $lxc | grep state| awk '{print $2;}' )" != "RUNNING" ] && lxc-start -d -n $lxc ||:
-    lxc-wait -n $lxc -s RUNNING
     
-    sense_lxc $lxc
+    #sense_lxc $lxc
 }
 
 function stop_lxc () {
 
     lxc=$1; shift
     [ "$(lxc-info -n $lxc | grep state| awk '{print $2;}' )" != "STOPPED" ] && lxc-stop -n $lxc
-    lxc-wait -n $lxc -s STOPPED
 
-    sense_lxc $lxc
+    #sense_lxc $lxc
 }
 
 function restart_all () {

diff --git a/tests.spec b/tests.spec
index 54d0d61..cea784c 100644 (file)
--- a/tests.spec
+++ b/tests.spec
@@ -1,3 +1,3 @@
 # for use by module-tools only
 %define version 5.1
-%define taglevel 1
+%define taglevel 2