From 16c37db4fd023dc52c5dbc854d8bba697efc287e Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Thu, 27 Aug 2020 08:11:06 +0200 Subject: [PATCH] Improve tests structure - rename test-reboot.yml to tests-reboot.yml so that it's run by CI directly - drop unnecessary tests.yml - add mandatory test.log, see https://docs.fedoraproject.org/en-US/ci/standard-test-interface/#_invocation - improve results.yml format - drop avc.err.log and log everything AVC related to avc.log --- tests/{test-reboot.yml => tests-reboot.yml} | 11 +++++++---- tests/tests.yml | 1 - 2 files changed, 7 insertions(+), 5 deletions(-) rename tests/{test-reboot.yml => tests-reboot.yml} (72%) delete mode 100644 tests/tests.yml diff --git a/tests/test-reboot.yml b/tests/tests-reboot.yml similarity index 72% rename from tests/test-reboot.yml rename to tests/tests-reboot.yml index f073546..94ea8a5 100644 --- a/tests/test-reboot.yml +++ b/tests/tests-reboot.yml @@ -31,9 +31,12 @@ - name: Gather SELinux denials since boot shell: | - ausearch -m avc -m selinux_err -m user_avc -ts boot > /tmp/avc.log 2> /tmp/avc.err.log - grep -q '' /tmp/avc.err.log && result=pass || result=fail - echo -e "results:\n- {result: $result, test: reboot}" > /tmp/results.yml + result=pass + dmesg | grep -i -e type=1300 -e type=1400 > /tmp/avc.log && result=fail + ausearch -m avc -m selinux_err -m user_avc -ts boot &>> /tmp/avc.log + grep -q '' /tmp/avc.log || result=fail + echo -e "\nresults:\n- test: reboot and collect AVC\n result: $result\n logs:\n - avc.log\n\n" > /tmp/results.yml + ( [ $result = "pass" ] && echo PASS test-reboot || echo FAIL test-reboot ) > /tmp/test.log always: - name: Pull out the artifacts @@ -42,6 +45,6 @@ src: "{{ item }}" flat: yes with_items: + - /tmp/test.log - /tmp/avc.log - - /tmp/avc.err.log - /tmp/results.yml diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index b073ca5..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1 +0,0 @@ -- import_playbook: test-reboot.yml