Merge ~mthaddon/jenkins-agent-charm/+git/jenkins-slave-charm:missing-dirs into jenkins-agent-charm:master

[Tom Haddon]

Create /var/lib/jenkins/slaves directories per lp#1829106

Create /var/lib/jenkins/slaves directories per lp#1829106

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

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

[Tom Haddon (mthaddon)]

Thanks, have updated based on review comments, PTAL

[Haw Loeung (hloeung)]

LGTM

review: Approve (+1)

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

Change successfully merged at revision 6ad7c8cea48115bbb887d22264fddd7252466a3b

diff --git a/reactive/jenkins_slave.py b/reactive/jenkins_slave.py
index c673499..8d54436 100644
--- a/reactive/jenkins_slave.py
+++ b/reactive/jenkins_slave.py
@@ -48,8 +48,14 @@ def install():
 
     # And ensure required directories exist and are set up.
     status.maintenance('Installing jenkins-slave (directories)...')
-    host.mkdir('/var/lib/jenkins', owner='jenkins', group='jenkins', perms=0o755)
-    host.mkdir('/var/log/jenkins', owner='jenkins', group='jenkins', perms=0o755)
+    slave_host = hookenv.local_unit().replace('/', '-')
+    for d in [
+        '/var/lib/jenkins',
+        '/var/lib/jenkins/slaves',
+        '/var/lib/jenkins/slaves/{}'.format(slave_host),
+        '/var/log/jenkins',
+    ]:
+        host.mkdir(d, owner='jenkins', group='jenkins', perms=0o755)
 
     status.maintenance('Installing jenkins-slave (common files)...')
     write_default_conf()
diff --git a/tests/unit/test_jenkins_slave.py b/tests/unit/test_jenkins_slave.py
index 860264a..d10d787 100644
--- a/tests/unit/test_jenkins_slave.py
+++ b/tests/unit/test_jenkins_slave.py
@@ -130,6 +130,8 @@ class TestSetDefaultConf(unittest.TestCase):
         self.assertFalse(adduser.assert_has_calls(expected, any_order=True))
         expected = [
             mock.call('/var/lib/jenkins', group='jenkins', owner='jenkins', perms=0o755),
+            mock.call('/var/lib/jenkins/slaves', group='jenkins', owner='jenkins', perms=0o755),
+            mock.call('/var/lib/jenkins/slaves/mock-jenkins-slave-0', group='jenkins', owner='jenkins', perms=0o755),
             mock.call('/var/log/jenkins', group='jenkins', owner='jenkins', perms=0o755),
         ]
         self.assertFalse(mkdir.assert_has_calls(expected, any_order=True))