After cve-check.bbclass refactor some variables changed, this commit updates them to get the test working properly.
Signed-off-by: Davide Gardenal <[email protected]> --- meta/lib/oeqa/selftest/cases/cve_check.py | 34 ++++++++++++++--------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/cve_check.py b/meta/lib/oeqa/selftest/cases/cve_check.py index d0b2213703..a06bda019f 100644 --- a/meta/lib/oeqa/selftest/cases/cve_check.py +++ b/meta/lib/oeqa/selftest/cases/cve_check.py @@ -52,12 +52,14 @@ class CVECheck(OESelftestTestCase): config = """ INHERIT += "cve-check" CVE_CHECK_FORMAT_JSON = "1" +CVE_CHECK_CREATE_BUILD_REPORT = "1" +CVE_CHECK_CREATE_RECIPE_REPORTS = "1" """ self.write_config(config) - vars = get_bb_vars(["CVE_CHECK_SUMMARY_DIR", "CVE_CHECK_SUMMARY_FILE_NAME_JSON"]) - summary_json = os.path.join(vars["CVE_CHECK_SUMMARY_DIR"], vars["CVE_CHECK_SUMMARY_FILE_NAME_JSON"]) - recipe_json = os.path.join(vars["CVE_CHECK_SUMMARY_DIR"], "m4-native_cve.json") + vars = get_bb_vars(["CVE_CHECK_OUTPUT_DIR", "CVE_CHECK_BUILD_REPORT_FILE_NAME_BASE"]) + summary_json = os.path.join(vars["CVE_CHECK_OUTPUT_DIR"], str(vars["CVE_CHECK_BUILD_REPORT_FILE_NAME_BASE"]) + ".json") + recipe_json = os.path.join(vars["CVE_CHECK_OUTPUT_DIR"], "recipes_reports/json/m4-native.json") try: os.remove(summary_json) @@ -88,11 +90,13 @@ CVE_CHECK_FORMAT_JSON = "1" config = """ INHERIT += "cve-check" CVE_CHECK_FORMAT_JSON = "1" +CVE_CHECK_CREATE_IMAGE_REPORT = "1" +CVE_CHECK_IMAGE_REPORT_FILE_NAME_BASE = "cve-report_core-image-minimal-initramfs-qemux86-64" """ self.write_config(config) - vars = get_bb_vars(["CVE_CHECK_DIR", "CVE_CHECK_SUMMARY_DIR", "CVE_CHECK_SUMMARY_FILE_NAME_JSON"]) - report_json = os.path.join(vars["CVE_CHECK_SUMMARY_DIR"], vars["CVE_CHECK_SUMMARY_FILE_NAME_JSON"]) + vars = get_bb_vars(["DEPLOY_DIR_IMAGE", "CVE_CHECK_IMAGE_REPORT_FILE_NAME_BASE", "CVE_CHECK_OUTPUT_DIR"]) + report_json = os.path.join(vars["DEPLOY_DIR_IMAGE"], str(vars["CVE_CHECK_IMAGE_REPORT_FILE_NAME_BASE"]) + ".json") print(report_json) try: os.remove(report_json) @@ -108,9 +112,9 @@ CVE_CHECK_FORMAT_JSON = "1" self.assertEqual(report["version"], "1") self.assertGreater(len(report["package"]), 1) - # Check that a random recipe wrote a recipe report to deploy/cve/ + # Check that a random recipe wrote a recipe report to log/cve/recipes-reports/json recipename = report["package"][0]["name"] - recipe_report = os.path.join(vars["CVE_CHECK_DIR"], recipename + "_cve.json") + recipe_report = os.path.join(str(vars["CVE_CHECK_OUTPUT_DIR"]), "recipes_reports/json/" + recipename + ".json") self.assertExists(recipe_report) with open(recipe_report) as f: report = json.load(f) @@ -124,12 +128,14 @@ CVE_CHECK_FORMAT_JSON = "1" INHERIT += "cve-check" CVE_CHECK_FORMAT_JSON = "1" CVE_CHECK_REPORT_PATCHED = "0" +CVE_CHECK_CREATE_BUILD_REPORT = "1" +CVE_CHECK_CREATE_RECIPE_REPORTS = "1" """ self.write_config(config) - vars = get_bb_vars(["CVE_CHECK_SUMMARY_DIR", "CVE_CHECK_SUMMARY_FILE_NAME_JSON"]) - summary_json = os.path.join(vars["CVE_CHECK_SUMMARY_DIR"], vars["CVE_CHECK_SUMMARY_FILE_NAME_JSON"]) - recipe_json = os.path.join(vars["CVE_CHECK_SUMMARY_DIR"], "m4-native_cve.json") + vars = get_bb_vars(["CVE_CHECK_OUTPUT_DIR", "CVE_CHECK_BUILD_REPORT_FILE_NAME_BASE"]) + summary_json = os.path.join(vars["CVE_CHECK_OUTPUT_DIR"], str(vars["CVE_CHECK_BUILD_REPORT_FILE_NAME_BASE"]) + ".json") + recipe_json = os.path.join(vars["CVE_CHECK_OUTPUT_DIR"], "recipes_reports/json/m4-native.json") try: os.remove(summary_json) @@ -160,12 +166,14 @@ CVE_CHECK_REPORT_PATCHED = "0" INHERIT += "cve-check" CVE_CHECK_FORMAT_JSON = "1" CVE_CHECK_REPORT_PATCHED = "1" +CVE_CHECK_CREATE_BUILD_REPORT = "1" +CVE_CHECK_CREATE_RECIPE_REPORTS = "1" """ self.write_config(config) - vars = get_bb_vars(["CVE_CHECK_SUMMARY_DIR", "CVE_CHECK_SUMMARY_FILE_NAME_JSON"]) - summary_json = os.path.join(vars["CVE_CHECK_SUMMARY_DIR"], vars["CVE_CHECK_SUMMARY_FILE_NAME_JSON"]) - recipe_json = os.path.join(vars["CVE_CHECK_SUMMARY_DIR"], "logrotate_cve.json") + vars = get_bb_vars(["CVE_CHECK_OUTPUT_DIR", "CVE_CHECK_BUILD_REPORT_FILE_NAME_BASE"]) + summary_json = os.path.join(vars["CVE_CHECK_OUTPUT_DIR"], str(vars["CVE_CHECK_BUILD_REPORT_FILE_NAME_BASE"]) + ".json") + recipe_json = os.path.join(vars["CVE_CHECK_OUTPUT_DIR"], "recipes_reports/json/logrotate.json") try: os.remove(summary_json) -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#167343): https://lists.openembedded.org/g/openembedded-core/message/167343 Mute This Topic: https://lists.openembedded.org/mt/92043908/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
