Merge lp:~thedac/charms/precise/daisy-retracer/sandbox-config into lp:~daisy-pluckers/charms/precise/daisy-retracer/trunk

[David Ames]

Allow use of the --cleanup-sandbox and --cleanup-debs switches

[Brian Murray (brian-murray)]

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2014-12-16 18:37:27 +0000
+++ config.yaml	2014-12-16 23:14:53 +0000
@@ -138,6 +138,24 @@
         If left True, the default use of --sandbox-dir at 
         /srv/$sitename/$instance-type/cache is used by retracer.py. If False,
         the --nouse-sandbox switch is used. 
+  cleanup-sandbox:
+      default: False
+      type: boolean
+      description: |
+        If True, retracer.py is run with the --cleanup-sandbox options and will
+        cleanup the sandbox 
+        /srv/$sitename/$instance-type/cache/$release/cache-xyz/sandbox directory
+        after each retrace. If left False, retracer.py uses the default behavior
+        of leaving cached chroot data on disk.
+  cleanup-debs:
+      default: False
+      type: boolean
+      description: |
+        If True, retracer.py is run with the --cleanup-debs options and will
+        cleanup the debs cache 
+        /srv/$sitename/$instance-type/cache/$release/cache-xyz/cache directory
+        after each retrace. If left False, retracer.py uses the default behavior
+        of leaving cached debs data on disk.
   daisy-cassandra-username:
       type: string
       default: ''

=== modified file 'hooks/common'
--- hooks/common	2014-12-16 18:37:27 +0000
+++ hooks/common	2014-12-16 23:14:53 +0000
@@ -28,6 +28,9 @@
 PACKAGE_STATUS="$(config-get package-status)"
 CACHE_DEBS="$(config-get cache-debs)"
 SANDBOX="$(config-get sandbox)"
+CLEANUP_SANDBOX="$(config-get cleanup-sandbox)"
+CLEANUP_DEBS="$(config-get cleanup-debs)"
+
 if [ "$CACHE_DEBS" = "False" ]; then
     CACHE_DEBS="--nocache-deb"
 else
@@ -38,6 +41,16 @@
 else
     SANDBOX="--sandbox-dir $CACHE_DIR --nouse-sandbox"
 fi
+if [ "$CLEANUP_SANDBOX" = "True" ]; then
+    CLEANUP_SANDBOX="--cleanup-sandbox"
+else
+    CLEANUP_SANDBOX=""
+fi
+if [ "$CLEANUP_DEBS" = "True" ]; then
+    CLEANUP_DEBS="--cleanup-debs"
+else
+    CLEANUP_DEBS=""
+fi
 
 save_setting () {
     key="$1"
@@ -95,7 +108,7 @@
 export PYTHONPATH
 env PATH=$APPORT_LOCATION/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 export PATH
-exec $CODE_LOCATION/daisy/retracer.py --config-dir $CODE_LOCATION/retracer/config $SANDBOX --output $LOG_DIR/retracer-$arch.log --architecture $arch $CACHE_DEBS
+exec $CODE_LOCATION/daisy/retracer.py --config-dir $CODE_LOCATION/retracer/config $SANDBOX --output $LOG_DIR/retracer-$arch.log --architecture $arch $CACHE_DEBS $CLEANUP_SANDBOX $CLEANUP_DEBS
 EOF
         juju-log "Starting $arch retracer"
         start retracer-$arch