-
Notifications
You must be signed in to change notification settings - Fork 75
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[DNM] [SES5] qa: add --apparmor option to all test scripts #1031
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Other then inline comment, looks good to me.
qa/suites/basic/health-rgw.sh
Outdated
CLI="" | ||
SSL="" | ||
while true ; do | ||
case "$1" in | ||
--cli) CLI="cli" ; shift ;; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This deletion seems to be an accident?
42d33c1
to
d364100
Compare
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
d364100
to
8bb6056
Compare
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
qa/common/common.sh
Outdated
@@ -430,6 +430,7 @@ EOF | |||
function ceph_apparmor { | |||
salt '*' state.apply ceph.apparmor | |||
salt '*' cmd.run 'systemctl | grep -i apparmor' | |||
salt '*' cmd.run '/usr/sbin/apparmor_status' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Imho it would be better to use /usr/sbin/aa-status
here. /usr/sbin/apparmor_status
is a symlink to aa-status
...might be suse specific..?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So use aa-status
here, too?
DeepSea/srv/modules/runners/ready.py
Line 74 in d8a1c2d
contents = self.local.cmd(self.search , 'cmd.shell', [ '/usr/sbin/apparmor_status --enabled 2>/dev/null; echo $?' ], expr_form="compound") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah thats probably a good idea as well.
edit: I'm on it.
apparmor_status is just a symlink to aa-status, so use the latter. Signed-off-by: Nathan Cutler <ncutler@suse.com>
This is still set to DNM. Also, I thought we had a smoketest for apparmor on the horizon. |
we should close that. any objections @smithfarm ? |
closing in favor of apparmor coverage in |
$SUBJ is self-explanatory