Merge branch 'wip/andrunko/T5551' into 'master'

Update apparmor-tumbler with new instructions

See merge request tests/apertis-tests-cases!1

tests-cases/apparmor-tumbler.yaml

@@ -8,10 +8,12 @@ metadata:
   priority: medium
   maintainer: "Apertis Project"
 
-  description: "Tests that the tumbler profile doesn't cause false negatives and
+  description: "Tests that the tumbler AppArmor profile doesn't cause false negatives and
                 that it does not allow arbitrary reading of files in the home
                 directory."
 
+  macro_ostree_preconditions: apparmor-tumbler
+
   expected:
     - "Both tests should report pass and not fail:"
     - |
@@ -21,23 +23,13 @@ metadata:
   notes:
     - "The results of the tests printed to the standard output are enough to
        determine whether they passed or fail."
-    - "If you get a failure and need to report a bug please run sudo watch-aa on
-       a terminal and run the case that is failing (separately, if both), and add
-       the logs you get to the bug report."
-
-install:
-  deps:
-  - bash
-  - busybox
-  - apertis-tests-apparmor-report
-  - apertis-tests-apparmor-tumbler
+    - "If you get a failure and need to report a bug please check journalctl, run
+       the test case again, and add the logs you get to the bug report."
 
 run:
   steps:
-  - "# Execute the following commands:"
-  - echo -n | sudo tee /var/log/audit/audit.log
-  - common/run-test-in-systemd --name run-test-tumbler --timeout 900 apparmor/tumbler/test-tumbler
-  - sudo cat /var/log/audit/audit.log | aa_log_extract_tokens.pl PERMITTING REJECTING
+    - "# Execute the following commands:"
+    - common/run-test-in-systemd --name run-test-sh --timeout 900 ./run-test.sh
 
 parse:
   fixupdict: