From e8ea8695e12daddd3f973a23fa804c2a818b3c6d Mon Sep 17 00:00:00 2001 From: Simone Weiß Date: Fri, 23 Feb 2024 21:07:40 +0000 Subject: patchtest: Skip test for CVE_CHECK_IGNORE for older branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Skip the test for checking if CVE_CHECK_IGNORE is not used. It is deprecated now, but was not deprecated for kirkstone and dunfell. Skip it therefore if a patch is intended for those branches. (From OE-Core rev: e9b04664b1b2ba6aa1fa7318e3d4174b9cdb19da) Signed-off-by: Simone Weiß Signed-off-by: Richard Purdie --- meta/lib/patchtest/tests/test_metadata.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/lib/patchtest/tests/test_metadata.py b/meta/lib/patchtest/tests/test_metadata.py index 174dfc31c6..be609dbd04 100644 --- a/meta/lib/patchtest/tests/test_metadata.py +++ b/meta/lib/patchtest/tests/test_metadata.py @@ -182,8 +182,10 @@ class TestMetadata(base.Metadata): self.fail('%s is missing in newly added recipe' % self.metadata_summary) def test_cve_check_ignore(self): - if not self.modified: - self.skip('No modified recipes, skipping test') + # Skip if we neither modified a recipe or target branches are not + # Nanbield and newer. CVE_CHECK_IGNORE was first deprecated in Nanbield. + if not self.modified or PatchTestInput.repo.branch == "kirkstone" or PatchTestInput.repo.branch == "dunfell": + self.skip('No modified recipes or older target branch, skipping test') for pn in self.modified: # we are not interested in images if 'core-image' in pn: -- cgit v1.2.3-54-g00ecf