From eac503842dd15200b596923b82b2a566915b4c0f Mon Sep 17 00:00:00 2001 From: jane400 Date: Fri, 12 Jul 2024 16:00:00 +0200 Subject: [PATCH] CI: pytest: set pmaports dir via `pmbootstrap config` (MR 5566) This works around pmbootstrap always announcing something when using `--aports`. It announces this: `Overriding config.aports with [PosixPath('..')]` --- .ci/pytest.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.ci/pytest.sh b/.ci/pytest.sh index 6e0bb741d..d1eea5150 100755 --- a/.ci/pytest.sh +++ b/.ci/pytest.sh @@ -19,16 +19,11 @@ if [ -z "$(command -v pytest)" ]; then exit 1 fi -# Wrap pmbootstrap to use this repository for --aports pmaports="$(cd "$(dirname "$0")"/..; pwd -P)" -_pmbootstrap="$(command -v pmbootstrap)" -pmbootstrap() { - "$_pmbootstrap" --aports="$pmaports" "$@" -} - # Make sure that the work folder format is up to date, and that there are no # mounts from aborted test cases (pmbootstrap#1595) pmbootstrap work_migrate +pmbootstrap config aports "$pmaports" pmbootstrap -q shutdown # Make sure we have a valid device (pmbootstrap#1128)