From a1a2f80a518c0250bc0df3bc3a42b6114d7419d6 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Sun, 11 Sep 2022 21:15:37 +0200 Subject: [PATCH] CI: require pmb:kconfigcheck-community for community/main devices (MR 3422) Since nftables check is a part of community check, we can safely remove the explicit nftables check. [ci:skip-build] --- .ci/testcases/test_kernel.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/testcases/test_kernel.py b/.ci/testcases/test_kernel.py index 2e6395e99..dc9f6381a 100644 --- a/.ci/testcases/test_kernel.py +++ b/.ci/testcases/test_kernel.py @@ -34,9 +34,9 @@ def test_aports_kernel(args): " pmbootstrap installs cross-compiler" " automatically.") - # nftables support in kernels used by main and community devices + # check some options only for main and community devices for dir in ["main", "device/main", "device/community"]: if path.startswith(f"{args.aports}/{dir}"): - assert pmb.parse.kconfig.check(args, - aport_name.replace("linux-", ""), - force_nftables_check=True) + if "pmb:kconfigcheck-community" not in apkbuild["options"]: + raise RuntimeError(f"{aport_name}: \"pmb:kconfigcheck-community\" missing in" + " options= line, required for all community/main devices.")