Skip to content

Commit

Permalink
Fix rsyslog permission error in github ubuntu tests from apparmor (#1…
Browse files Browse the repository at this point in the history
…5717)

* Add test to detect rsyslog config problems

* Get dmesg output

* Disable apparmor for rsyslogd
  • Loading branch information
AlanCoding authored Feb 5, 2025
1 parent c2e5425 commit 26346d2
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
8 changes: 8 additions & 0 deletions .github/actions/run_awx_devel/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@ outputs:
runs:
using: composite
steps:
- name: Disable apparmor for rsyslogd, first step
shell: bash
run: sudo ln -s /etc/apparmor.d/usr.sbin.rsyslogd /etc/apparmor.d/disable/

- name: Disable apparmor for rsyslogd, second step
shell: bash
run: sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.rsyslogd

- name: Build awx_devel image for running checks
uses: ./.github/actions/awx_devel_image
with:
Expand Down
10 changes: 10 additions & 0 deletions awx/main/tests/live/tests/test_devel_image.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import os

RSYSLOG_CONFIG = '/var/lib/awx/rsyslog/rsyslog.conf'


def test_rsyslog_config_readable():
with open(RSYSLOG_CONFIG, 'r') as f:
content = f.read()
assert '/var/lib/awx/rsyslog' in content
assert oct(os.stat(RSYSLOG_CONFIG).st_mode) == '0o100640'

0 comments on commit 26346d2

Please sign in to comment.