X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fnightly-clean-trash.sh;h=91d332b88e7d9d2d76906fe53aa77088ee671caa;hb=8784cfd2db996cd5b065d40d4eba282557056602;hp=1b927eb87f3a35ec5dceed504fce3bc7808de140;hpb=b993dccbad34218b99ea788f074a3f176fc73af3;p=infrastructure.git

diff --git a/scripts/nightly-clean-trash.sh b/scripts/nightly-clean-trash.sh
index 1b927eb..91d332b 100755
--- a/scripts/nightly-clean-trash.sh
+++ b/scripts/nightly-clean-trash.sh
@@ -3,18 +3,39 @@
 # -mtime +1 : older than one day
 # grep -v : preserve the top directory
 
+# this script is obsolete
+# as it is still mentioned in our build boxes crontabs we keep it alive for now
+
+exit 0
+
+exec >> /root/.nightly-clean-trash.log
+exec 2>&1
+
+date
+
 [[ -n "$@" ]] && [ "$1" = "-n" ] && set -x
 
 todelete=$(find /build/trash -maxdepth 1 -mtime +1 -print | grep -v 'trash/*$')
-potential_vservers=$(find /build/trash -maxdepth 1 -type d -print | grep -v 'trash/*$')
+potential_vservers=$(find /build/trash -maxdepth 1 -type d -print 2> /dev/null | grep -v 'trash/*$')
 
 # clean the vservers first
-for vserver in $potential_vservers ; do
+[ -d /vservers ] && for vserver in $potential_vservers ; do
     vname=$(basename $vserver)
+    vname=$(basename $vname .log.txt)
+    vname=$(basename $vname .timestamp)
     if [ -d /vservers/$vname ] ; then
-	vserver --silent delete $vname
+	virsh -c lxc:/// destroy $vname >$ /dev/null && echo $vname destroyed
+	virsh -c lxc:/// undefine $vname >$ /dev/null && echo $vname undefined
 	rm -f /vservers/${vname}.log.txt
+	rm -f /vservers/${vname}.timestamp
     fi
 done
 
 echo $todelete | xargs rm -rf
+
+daily_vnames=$(find /vservers/ -maxdepth 1 -type d -name '20*'  -mtime +14 -print 2> /dev/null | sed -e 's,^/vservers/,,')
+for vname in $daily_vnames; do
+   [ -f /vservers/${vname}.log.txt ] && rm  /vservers/${vname}.log.txt
+   [ -d /vservers/$vname ] && vserver --silent $vname delete
+done
+