Merge ~hloeung/jenkins-agent-charm:master into jenkins-agent-charm:master

Proposed by Haw Loeung
Status: Merged
Approved by: Paul Collins
Approved revision: 135400c00ad583a9ed11d08b380f6a4b019d4f27
Merged at revision: 767168b766d68777b81ce83126ce0377d72a1709
Proposed branch: ~hloeung/jenkins-agent-charm:master
Merge into: jenkins-agent-charm:master
Diff against target: 15 lines (+2/-2)
1 file modified
reactive/jenkins_slave.py (+2/-2)
Reviewer Review Type Date Requested Status
Paul Collins lgtm Approve
Canonical IS Reviewers Pending
Review via email: mp+373786@code.launchpad.net

Commit message

Fixed permissions for directories created

Description of the change

Things like snaps needs to write to the home directory, /var/lib/jenkins/snap. Default host.mkdir permissions is 0o555.

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

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

Revision history for this message
Paul Collins (pjdc) :
review: Approve (lgtm)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 767168b766d68777b81ce83126ce0377d72a1709

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/reactive/jenkins_slave.py b/reactive/jenkins_slave.py
2index 01b99b4..c673499 100644
3--- a/reactive/jenkins_slave.py
4+++ b/reactive/jenkins_slave.py
5@@ -48,8 +48,8 @@ def install():
6
7 # And ensure required directories exist and are set up.
8 status.maintenance('Installing jenkins-slave (directories)...')
9- host.mkdir('/var/lib/jenkins', owner='jenkins', group='jenkins')
10- host.mkdir('/var/log/jenkins', owner='jenkins', group='jenkins')
11+ host.mkdir('/var/lib/jenkins', owner='jenkins', group='jenkins', perms=0o755)
12+ host.mkdir('/var/log/jenkins', owner='jenkins', group='jenkins', perms=0o755)
13
14 status.maintenance('Installing jenkins-slave (common files)...')
15 write_default_conf()

Subscribers

People subscribed via source and target branches