apparmor-basic-profiles: run from source directory or apertis-tests

Previously, we used the installed copy in chaiwala-tests; but we don't
actually need that, a source directory is fine. This means we can
drop the dependency on chaiwala-tests.

This simplifies deployment of a new version of the test on LAVA.

We can also drop the dependency on busybox, which we haven't used
since moving to run-test-in-systemd.

Differential Revision: https://phabricator.apertis.org/D492
Reviewed-by: pwith

Makefile

@@ -58,6 +58,7 @@ SUBDIRS = \
 COPY = \
 	$(wildcard apparmor/*.sh) \
 	$(wildcard apparmor/*.yaml) \
+	apparmor/automated \
 	apparmor/folks \
 	apparmor/run-aa-test \
 	clutter \

apparmor/apparmor-basic-profiles.yaml

@@ -11,14 +11,9 @@ metadata:
   environment:
   - lava-test-shell
 
-install:
-  deps:
-  - busybox
-  - chaiwala-tests
-
 run:
   steps:
-    - common/run-test-in-systemd --user=user --timeout=90 --basename /usr/share/chaiwala-tests/apparmor/automated/run-test.sh
+    - common/run-test-in-systemd --user=user --timeout=90 --basename apparmor/automated/run-test.sh
 
 parse:
   pattern: ^(?P<test_case_id>[a-zA-Z0-9_\-\./]+):\s*(?P<result>pass|fail|skip|unknown)$

debian/apertis-tests.install

 usr/lib/apertis-tests/apparmor/*.sh
 usr/lib/apertis-tests/apparmor/*.yaml
+usr/lib/apertis-tests/apparmor/automated
 usr/lib/apertis-tests/apparmor/folks
 usr/lib/apertis-tests/apparmor/run-aa-test
 usr/lib/apertis-tests/clutter

debian/changelog

@@ -4,6 +4,10 @@ apertis-tests (1:0.20150917.0) UNRELEASED; urgency=medium
   * tracker: add more debug messages
   * tracker: wait for tumbler to finish creating thumbnails (Apertis: #502)
 
+  [ Simon McVittie ]
+  * apparmor-basic-profiles: run from source directory or apertis-tests, not
+    from chaiwala-tests
+
  -- Simon McVittie <simon.mcvittie@collabora.co.uk>  Thu, 17 Sep 2015 14:11:17 +0100
 
 apertis-tests (1:0.20150909.3) 15.09; urgency=medium