Skip to content
Snippets Groups Projects
Commit 3d52f61c authored by Emanuele Aina's avatar Emanuele Aina
Browse files

apparmor-bluez-setup: Fix preconditions and paths


Use the multiple ostree preconditions support introduced in 6b2fd91e
instead of hardcoding the blurb for the second repository.

Also fix the branches and the resulting paths for the unpacked scripts.

Signed-off-by: Emanuele Aina's avatarEmanuele Aina <emanuele.aina@collabora.com>
parent dc1f7c8b
No related branches found
No related tags found
1 merge request!165apparmor-bluez-setup: Fix preconditions and paths
Pipeline #135825 passed
......@@ -20,14 +20,11 @@ metadata:
- "A Bluetooth device."
macro_ostree_preconditions:
reponame: apparmor-bluez-setup
branch: apertis/v2021dev2
- reponame: apparmor-bluez-setup
branch: apertis/v2021dev2
- reponame: bluez-setup
branch: apertis/v2021dev2
pre-conditions:
- "Additionnally, it is necessary to get a copy of bluez-setup test:"
- $ cd $HOME
- $ wget https://gitlab.apertis.org/tests/bluez-setup/-/archive/master/bluez-setup-master.tar.gz
- $ tar -xvf bluez-setup-master.tar.gz
- $ scp -r bluez-setup-master user@$DUT_IP:.
- "Please note that connman disables bluetooth by default on a fresh image.
If it's already enabled, connmanctl will give an \"In progress\" error that
may be ignored. To enable the device:"
......@@ -85,10 +82,10 @@ run:
steps:
- "First ensure that the bluez-setup test case is passing before executing the
apparmor-bluez-setup test one (otherwise false-negative might occur):"
- $ cd $HOME/bluez-setup-master ; ./check-setup.sh
- $ cd $HOME/bluez-setup-* ; ./check-setup.sh
- "After verifying that the bluez-setup test is passing, open a new terminal
and run the following. Do not yet answer to the question."
- $ cd $HOME/apparmor-bluez-setup-master; ./aa_get_complaints.sh
- $ cd $HOME/apparmor-bluez-setup-* ; ./aa_get_complaints.sh
- "Now, run the bluez-setup test case again in the previous terminal."
- $ cd $HOME/bluez-setup-master ; ./check-setup.sh
- $ cd $HOME/bluez-setup-* ; ./check-setup.sh
- "After the bluez-setup test ended, answer y to check for complaints."
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment