Merge ~hloeung/apt-stresstest-charm:chdist into apt-stresstest-charm:master

[Haw Loeung]

Cleanup older chdist directories - LP:1915791

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Thomas Cuthbert (tcuthbert)]

LGTM +1

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision efcc9884f1b0430b8785f9e3c3b57d9acd937b39

diff --git a/files/test_apt_mirrors.py b/files/test_apt_mirrors.py
index 621b592..257d31c 100755
--- a/files/test_apt_mirrors.py
+++ b/files/test_apt_mirrors.py
@@ -25,6 +25,7 @@ import socket
 import subprocess
 import sys
 import tempfile
+import time
 
 from yaml import safe_load
 
@@ -238,6 +239,10 @@ def chdist_create(domain, ip, series=None, data_dir=None):
     chdist = '{}-{}-{}'.format(domain, ip, series)
     source_uri = 'http://{}/ubuntu'.format(ip)
     if os.path.exists(get_chdist_config_path(chdist, data_dir)):
+        # Update the timestamp of chdist directories, this lets the
+        # cron job clean up older unused ones.
+        now = time.time()
+        os.utime(os.path.join(data_dir, chdist), (now, now))
         return False
     cmd = ['chdist', '-d', data_dir, 'create', chdist, source_uri, series, 'main', 'universe']
     subprocess.call(cmd, stdout=subprocess.DEVNULL)
diff --git a/reactive/apt_stresstest.py b/reactive/apt_stresstest.py
index 3655300..55893ba 100644
--- a/reactive/apt_stresstest.py
+++ b/reactive/apt_stresstest.py
@@ -36,6 +36,9 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
 # Clean up left over downloads from previous test. This is likely due to hitting the run timeout.
 */10 * * * * {user} find /tmp -maxdepth 1 -type d -name 'apt-stresstest-*' -mmin +{cleanup_time} -exec rm -rf {{}} +
+# Clean up older unused chdists.
+1 1 * * * {user} find ~{user}/.chdist -maxdepth 1 -mindepth 1 -type d -mtime +1 -exec rm -rf {{}} +
+
 """  # NOQA: E501
 
 LOGFILE = '/var/log/apt-stresstest.log'