From: Simone Weiß Date: Fri, 23 Feb 2024 21:07:40 +0000 (+0000) Subject: patchtest: Skip test for CVE_CHECK_IGNORE for older branches X-Git-Tag: uninative-4.4~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9b04664b1b2ba6aa1fa7318e3d4174b9cdb19da;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git patchtest: Skip test for CVE_CHECK_IGNORE for older branches 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. Signed-off-by: Simone Weiß Signed-off-by: Richard Purdie --- diff --git a/meta/lib/patchtest/tests/test_metadata.py b/meta/lib/patchtest/tests/test_metadata.py index 174dfc31c66..be609dbd048 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: