From bd7bc9d3393728f54a5d4888276cf5825954efa1 Mon Sep 17 00:00:00 2001
From: Emanuele Aina <emanuele.aina@collabora.com>
Date: Fri, 6 Sep 2019 01:06:53 +0200
Subject: [PATCH] apparmor-{geoclue,ofono,tracker}: Explicitly install auditd
The `auditd` package is being dropped from the images. The audit log can be
retrieved from the system journal, and the `auditd` daemon currently fails to
start on the ostree images.
However, the apparmor-{geoclue,ofono,tracker} testcases use the `run-aa-test`
tool which is not trivial to port away from `audit.log`, so add an explicit
installation step for the `auditd` package to paper over it.
Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>
---
test-cases/apparmor-geoclue.yaml | 1 +
test-cases/apparmor-ofono.yaml | 2 +-
test-cases/apparmor-tracker.yaml | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/test-cases/apparmor-geoclue.yaml b/test-cases/apparmor-geoclue.yaml
index f6cd292..825fcea 100644
--- a/test-cases/apparmor-geoclue.yaml
+++ b/test-cases/apparmor-geoclue.yaml
@@ -31,6 +31,7 @@ install:
deps:
- busybox
- apertis-tests-apparmor-geoclue
+ - auditd
- geoclue-2.0
- geoclue-2-demo
git-repos:
diff --git a/test-cases/apparmor-ofono.yaml b/test-cases/apparmor-ofono.yaml
index 0cc8252..7cb2475 100644
--- a/test-cases/apparmor-ofono.yaml
+++ b/test-cases/apparmor-ofono.yaml
@@ -15,7 +15,7 @@ metadata:
resources:
- "A 3G modem connected."
- macro_install_packages_preconditions: apertis-tests-apparmor-ofono apertis-tests
+ macro_install_packages_preconditions: auditd apertis-tests-apparmor-ofono apertis-tests
expected:
- "A list of executed test with related result (as pass/fail/skip) will be
diff --git a/test-cases/apparmor-tracker.yaml b/test-cases/apparmor-tracker.yaml
index 583c61f..6a1444a 100644
--- a/test-cases/apparmor-tracker.yaml
+++ b/test-cases/apparmor-tracker.yaml
@@ -37,6 +37,7 @@ install:
- busybox
- apertis-tests-apparmor-report
- apertis-tests-apparmor-tracker
+ - auditd
- gir1.2-grilo-0.3
- gir1.2-tracker-2.0
- python3
--
GitLab