Merge lp:~roadmr/checkbox/lxc-fix-permissions-after-provisioning-fail into lp:checkbox

[Daniel Manrique]

test-in-lxc: Fix file permissions if provisioning fails.

Writing files in the source tree during the provisioning phase is
not recommended, but if it happens, ensure that, after a possible
provisioning failure, permissions are reset to those of the user who
owned the original tree (using test-in-lxc.sh as reference).

Previously we would only fix file permissions after running the tests,
and the provisioning phase was assumed not to leave possibly-undeletable
files in the source directory.

test-in-lxc: Fix file permissions if provisioning fails.

Writing files in the source tree during the provisioning phase is
not recommended, but if it happens, ensure that, after a possible
provisioning failure, permissions are reset to those of the user who
owned the original tree (using test-in-lxc.sh as reference).

Previously we would only fix file permissions after running the tests,
and the provisioning phase was assumed not to leave possibly-undeletable
files in the source directory.

[Zygmunt Krynicki (zyga)]

+1

review: Approve

=== modified file 'test-in-lxc.sh'
--- test-in-lxc.sh	2014-06-16 21:31:53 +0000
+++ test-in-lxc.sh	2015-04-16 21:55:51 +0000
@@ -118,7 +118,7 @@
         echo "[$target] Unable to provision requirements in container!"
         echo "[$target] stdout: $(pastebinit $LOG_DIR/$target.provision.log)"
         echo "[$target] stderr: $(pastebinit $LOG_DIR/$target.provision.err)"
-        echo "[$target] NOTE: unable to execute tests, marked as failed"
+        fix_permissions
         echo "[$target] Destroying failed container to reclaim resources"
         sudo $LXC_DESTROY -f -n $target_container
         return 1
@@ -126,6 +126,21 @@
     cat $TIMING | sed -e "s/^/[$target] (timing) /"
 }
 
+fix_permissions(){
+    # Fix permissions.
+    # provision-testing-environment runs as root and creates a series of
+    # root-owned files in the branch directory. Later, tarmac will want
+    # to delete these files, so after provisioning we change everything
+    # under the branch directory to be owned by the unprivileged user,
+    # so stuff can be deleted correctly later.
+    echo "[$target] Fixing file permissions in source directory"
+    if ! sudo $LXC_ATTACH --keep-env -n $target_container -- bash -c "chown -R --reference=test-in-lxc.sh $PWD" >$LOG_DIR/$target.fix-perms.log 2>$LOG_DIR/$target.fix-perms.err; then
+        echo "[$target] Unable to fix permissions!"
+        echo "[$target] stdout: $(pastebinit $LOG_DIR/$target.fix-perms.log)"
+        echo "[$target] stderr: $(pastebinit $LOG_DIR/$target.fix-perms.err)"
+        echo "[$target] Some files owned by root may have been left around, fix them manually with chown."
+    fi
+}
 
 if [ "$1" = "" ]; then
     # Releases we actually want to test should be included in target_list below.
@@ -182,18 +197,7 @@
         cat $TIMING | sed -e "s/^/[$target] (timing) /"
     done
 
-    # Fix permissions.
-    # provision-testing-environment runs as root and creates a series of
-    # root-owned files in the branch directory. Later, tarmac will want
-    # to delete these files, so after provisioning we change everything
-    # under the branch directory to be owned by the unprivileged user,
-    # so stuff can be deleted correctly later.
-    if ! sudo $LXC_ATTACH --keep-env -n $target_container -- bash -c "chown -R --reference=test-in-lxc.sh $PWD" >$LOG_DIR/$target.fix-perms.log 2>$LOG_DIR/$target.fix-perms.err; then
-        echo "[$target] Unable to fix permissions!"
-        echo "[$target] stdout: $(pastebinit $LOG_DIR/$target.fix-perms.log)"
-        echo "[$target] stderr: $(pastebinit $LOG_DIR/$target.fix-perms.err)"
-        echo "[$target] Some files owned by root may have been left around, fix them manually with chown."
-    fi
+    fix_permissions
 
     echo "[$target] Destroying container"
     # Stop the container first