diff mbox series

[master,kirkstone,5/5] selftest/cve_check: update to new cve-check bb var

Message ID 20220628133713.3390786-5-davide.gardenal@huawei.com
State New, archived
Headers show
Series [master,kirkstone,1/5] lib/oe/cve_check: refactor update_symlinks with safer version | expand

Commit Message

Davide Gardenal June 28, 2022, 1:37 p.m. UTC 
After cve-check.bbclass refactor some variables changed,
this commit updates them to get the test working properly.

Signed-off-by: Davide Gardenal <davide.gardenal@huawei.com>
---
 meta/lib/oeqa/selftest/cases/cve_check.py | 34 ++++++++++++++---------
 1 file changed, 21 insertions(+), 13 deletions(-)

Comments

Marta Rybczynska June 28, 2022, 4:05 p.m. UTC | #1 
On Tue, Jun 28, 2022 at 3:38 PM Davide Gardenal <davidegarde2000@gmail.com>
wrote:

> After cve-check.bbclass refactor some variables changed,
> this commit updates them to get the test working properly.
>
>
A general comment on this patch-set. There are quite many changes but it
makes
code way more regular between the text and JSON output.

I have currently other refactoring and various changes (symlinks,
generating the output without the database etc) but holding off to have
discussion on this one.

Kind regards,
Marta
diff mbox series

Patch

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)