Merge lp:~nskaggs/autopilot/add-isolation-apparmor-rules into lp:autopilot

Proposed by Nicholas Skaggs
Status: Superseded
Proposed branch: lp:~nskaggs/autopilot/add-isolation-apparmor-rules
Merge into: lp:autopilot
Diff against target: 16 lines (+9/-0)
1 file modified
apparmor/click.rules (+9/-0)
To merge this branch: bzr merge lp:~nskaggs/autopilot/add-isolation-apparmor-rules
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Thomi Richards (community) Approve
Review via email: mp+220760@code.launchpad.net

This proposal has been superseded by a proposal from 2014-05-24.

Commit message

Add apparmor rules for test isolation during run for clicks

Description of the change

Add apparmor rules for test isolation during run for clicks

To post a comment you must log in.
Revision history for this message
Thomi Richards (thomir-deactivatedaccount) :
review: Approve
Revision history for this message
Jamie Strandboge (jdstrand) wrote :

With the addition of HOMEDIRS, this will be compatible with the pending apparmor-easyprof-ubuntu 1.2.1 upload.

Revision history for this message
Jamie Strandboge (jdstrand) wrote :

*Sigh*, sorry see one more change over 491. Use this:
owner @{HOMEDIRS}/*/autopilot/fakeenv/*/.local/share/@{APP_PKGNAME}/** mrwklix,

instead of:
owner @{HOMEDIRS}/autopilot/fakeenv/*/.local/share/@{APP_PKGNAME}/** mrwklix,

I forgot HOMEDIRS expands to /home/ instead of /home/*/. Sorry for the multiple iterations.

492. By Nicholas Skaggs

tweak homedirs expansion

Revision history for this message
Jamie Strandboge (jdstrand) wrote :

I've tested r492 with apparmor-easyprof-ubuntu 1.2.1 (just uploaded to utopic) and it works as intended.

Revision history for this message
Thomi Richards (thomir-deactivatedaccount) wrote :

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:491
http://jenkins.qa.ubuntu.com/job/autopilot-ci/739/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/128
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-touch/111
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic-autopilot/97
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/515
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/515/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/862
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/862/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6642
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7581

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/739/rebuild

review: Approve (continuous-integration)

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'apparmor/click.rules'
2--- apparmor/click.rules 2013-09-20 19:06:30 +0000
3+++ apparmor/click.rules 2014-05-23 09:35:35 +0000
4@@ -1,3 +1,12 @@
5 dbus (receive, send)
6 bus=session
7 path=/com/canonical/Autopilot/**,
8+# Allow writes to various (application-specific) XDG directories
9+ owner @{HOME}/autopilot/fakeenv/*/.cache/@{APP_PKGNAME}/ rw, # subdir of XDG_CACHE_HOME
10+ owner @{HOME}/autopilot/fakeenv/*/.cache/@{APP_PKGNAME}/** mrwkl,
11+ owner @{HOME}/autopilot/fakeenv/*/.config/@{APP_PKGNAME}/ rw, # subdir of XDG_CONFIG_HOME
12+ owner @{HOME}/autopilot/fakeenv/*/.config/@{APP_PKGNAME}/** mrwkl,
13+ owner @{HOME}/autopilot/fakeenv/*/.local/share/@{APP_PKGNAME}/ rw, # subdir of XDG_DATA_HOME
14+ owner @{HOMEDIRS}/*/autopilot/fakeenv/*/.local/share/@{APP_PKGNAME}/** mrwklix,
15+ owner @{HOME}/autopilot/fakeenv/*/confined/@{APP_PKGNAME}/ rw, # subdir of XDG_RUNTIME_DIR
16+ owner @{HOME}/autopilot/fakeenv/*/confined/@{APP_PKGNAME}/** mrwkl,

Subscribers

People subscribed via source and target branches