diff options
author | Simone Weiß <simone.p.weiss@posteo.com> | 2024-02-23 21:07:40 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-02-24 16:10:23 +0000 |
commit | e8ea8695e12daddd3f973a23fa804c2a818b3c6d (patch) | |
tree | 78d8d63a435374af438baac8a5fb07fd963b4ee7 /meta | |
parent | 8a3f025b3a34484d53b27c1d3f9e2140058c0eb6 (diff) | |
download | poky-e8ea8695e12daddd3f973a23fa804c2a818b3c6d.tar.gz |
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.
(From OE-Core rev: e9b04664b1b2ba6aa1fa7318e3d4174b9cdb19da)
Signed-off-by: Simone Weiß <simone.p.weiss@posteo.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/patchtest/tests/test_metadata.py | 6 |
1 files 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): | |||
182 | self.fail('%s is missing in newly added recipe' % self.metadata_summary) | 182 | self.fail('%s is missing in newly added recipe' % self.metadata_summary) |
183 | 183 | ||
184 | def test_cve_check_ignore(self): | 184 | def test_cve_check_ignore(self): |
185 | if not self.modified: | 185 | # Skip if we neither modified a recipe or target branches are not |
186 | self.skip('No modified recipes, skipping test') | 186 | # Nanbield and newer. CVE_CHECK_IGNORE was first deprecated in Nanbield. |
187 | if not self.modified or PatchTestInput.repo.branch == "kirkstone" or PatchTestInput.repo.branch == "dunfell": | ||
188 | self.skip('No modified recipes or older target branch, skipping test') | ||
187 | for pn in self.modified: | 189 | for pn in self.modified: |
188 | # we are not interested in images | 190 | # we are not interested in images |
189 | if 'core-image' in pn: | 191 | if 'core-image' in pn: |