Merge lp:~robru/cupstream2distro/delete-distro-versions-after-diffing into lp:cupstream2distro

[Robert Bruce Park]

Delete distro versions after diffing.

We recently had a disk space crisis where Timo's qt silo was taking up 11GB (and total space of all silos was only 13GB). In addition to a runaway backup process, we managed to fill the entire 30GB disk.

One of the features of the train is diff generation, but in order to generate the diff it needs to have two copies of the package around: the copy we generated and the version in distro. This of course doubles our disk space usage.

This branch deletes distro versions after the diff has been generated, which is harmless. It is already the case that this directory gets deleted and new distro versions are downloaded each time a new diff is generated. So the only change here is that distro versions aren't kept around forever, taking up huge amounts of disk space.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:873
http://jenkins.qa.ubuntu.com/job/cu2d-choo-choo-ci/453/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/cu2d-choo-choo-ci/453/rebuild

review: Approve (continuous-integration)

[Łukasz Zemczak (sil2100)]

Looks safe, from what I see it's indeed not needed afterwards.

review: Approve

=== modified file 'citrain/jenkins-templates/build.xml.tmpl'
--- citrain/jenkins-templates/build.xml.tmpl	2015-02-13 22:40:39 +0000
+++ citrain/jenkins-templates/build.xml.tmpl	2015-02-16 17:46:50 +0000
@@ -101,6 +101,10 @@
 
 cp *.diff "$WORKSPACE" 2>/dev/null || true
 
+# ubuntu/ directory only contains distro versions, and only used for diffing.
+# This cuts our disk usage in half:
+rm -rf ubuntu/
+
 exit $RETVAL
 </command>
     </hudson.tasks.Shell>