diff options
| -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: |