From da34b4332bd8939eca6a37ab6ed9deac90043546 Mon Sep 17 00:00:00 2001
From: Emanuele Aina <emanuele.aina@collabora.com>
Date: Wed, 10 Jun 2020 11:51:56 +0200
Subject: [PATCH] apparmor-bluez-setup: Fix preconditions and paths
Use the multiple ostree preconditions support introduced in 6b2fd91efb2b
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 <emanuele.aina@collabora.com>
---
test-cases/apparmor-bluez-setup.yaml | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/test-cases/apparmor-bluez-setup.yaml b/test-cases/apparmor-bluez-setup.yaml
index 66a2f5e9..db42d2c4 100644
--- a/test-cases/apparmor-bluez-setup.yaml
+++ b/test-cases/apparmor-bluez-setup.yaml
@@ -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:"
--
GitLab