From 92b0b3293081c06b651260fdabc9692618df04cd Mon Sep 17 00:00:00 2001 From: Say Date: Thu, 12 Dec 2024 03:04:34 -0500 Subject: [PATCH 1/5] Corrected DMESG and temporarily comment out pytest and string get result ar.payload_param --- app/models/score.py | 8 ++++---- app/score_card/app.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/score.py b/app/models/score.py index 27e1b34..d38ee54 100644 --- a/app/models/score.py +++ b/app/models/score.py @@ -175,7 +175,7 @@ def get_test_results(self): # noqa: C901 "pytest_skipped", ]: if not ar.payload_param == "NA": - entry += "(" + ar.payload_param + ")" + entry += "("+ str(ar.payload_param) +")" if entry in report[bn][test]["data"]: report[bn][test]["data"][entry].append( details @@ -194,9 +194,9 @@ def get_test_results(self): # noqa: C901 "drivers_missing", "dmesg_warnings_found", "dmesg_errors_found", - "pytest_errors", - "pytest_failures", - "pytest_skipped", + # "pytest_errors", + # "pytest_failures", + # "pytest_skipped", ]: if isinstance(report[bn][test]["data"], list): try: diff --git a/app/score_card/app.py b/app/score_card/app.py index 299c680..85cbcfa 100644 --- a/app/score_card/app.py +++ b/app/score_card/app.py @@ -547,7 +547,7 @@ def generate_dmesg_errors(data): dbc.Tab( generate_dash_table(data, "dmesg_errors_found"), tab_id="tab-2", - label="Dmeg Errors", + label="Dmesg Errors", ), ], active_tab="tab-1", From 3f2e98a484a884c8385ae7ed371b7f5967cb2f9b Mon Sep 17 00:00:00 2001 From: Say Date: Mon, 3 Feb 2025 20:05:16 -0500 Subject: [PATCH 2/5] fix in trigger url Signed-off-by: Say --- app/utility.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/utility.py b/app/utility.py index 8d401c2..e55901e 100644 --- a/app/utility.py +++ b/app/utility.py @@ -45,7 +45,7 @@ def url_gen( if trigger_dict[0] == "auto": trigger_project_name = trigger_dict[1].split("/")[0] trigger_build_number = trigger_dict[2] - url_trigger = "http://{}/job/{}/{}/".format( + url_trigger = "http://{}/view/all/job/Triggers/job/{}/{}/".format( jenkins_server, trigger_project_name, trigger_build_number ) else: From 6d248d147eee10f8acf73cbe6a5f3643c9fe823e Mon Sep 17 00:00:00 2001 From: Say Date: Mon, 3 Feb 2025 22:53:27 -0500 Subject: [PATCH 3/5] added whitespace, upgrade click for black formatting Signed-off-by: Say --- app/models/score.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/score.py b/app/models/score.py index d38ee54..296a7ab 100644 --- a/app/models/score.py +++ b/app/models/score.py @@ -175,7 +175,7 @@ def get_test_results(self): # noqa: C901 "pytest_skipped", ]: if not ar.payload_param == "NA": - entry += "("+ str(ar.payload_param) +")" + entry += "(" + str(ar.payload_param) + ")" if entry in report[bn][test]["data"]: report[bn][test]["data"][entry].append( details From ed11661b9d2c2234f117d232fd6dadcb0feff616 Mon Sep 17 00:00:00 2001 From: Say Date: Mon, 3 Feb 2025 23:07:32 -0500 Subject: [PATCH 4/5] Apply black formatting Signed-off-by: Say --- app/models/artifacts.py | 2 -- app/models/boot_tests.py | 3 --- app/score_card/app.py | 5 ----- 3 files changed, 10 deletions(-) diff --git a/app/models/artifacts.py b/app/models/artifacts.py index b326ddc..26535c9 100644 --- a/app/models/artifacts.py +++ b/app/models/artifacts.py @@ -17,7 +17,6 @@ def __init__(self, raw_artifact_result=None): self.__initialize_fields() def __initialize_fields(self): - fields = [ "archive_date", "url", @@ -47,7 +46,6 @@ def display(self): class Artifacts: def __init__(self, **filters): - self.db = DB(index_name="artifacts", keywords=Artifact.KEYWORDS) db_res = self.db.search(sort="archive_date", **filters) # create boards object from raw db_res diff --git a/app/models/boot_tests.py b/app/models/boot_tests.py index 0f67f88..d28a042 100644 --- a/app/models/boot_tests.py +++ b/app/models/boot_tests.py @@ -2,7 +2,6 @@ class BootTest: - KEYWORDS = [ "boot_folder_name", "hdl_branch", @@ -20,7 +19,6 @@ def __init__(self, raw_boot_test_result=None): self.__initialize_fields() def __initialize_fields(self): - fields = [ "boot_folder_name", "hdl_hash", @@ -143,7 +141,6 @@ def __init__( source_adjacency_matrix=None, filters=None, ): - # if not boot_folder_name: # raise ValueError('boot_folder_name must not be null or empty') diff --git a/app/score_card/app.py b/app/score_card/app.py index 85cbcfa..d49d187 100644 --- a/app/score_card/app.py +++ b/app/score_card/app.py @@ -345,7 +345,6 @@ def generate_header(data): def generate_options(data): - options_div = html.Div( children=[ html.H5("Project"), @@ -421,7 +420,6 @@ def generate_options(data): def generate_dash_table(data, target, groupby="item"): - latest_build = list(data["builds"].keys())[0] label = " ".join([ele.title() for ele in target.split("_")]) @@ -476,7 +474,6 @@ def generate_dash_table(data, target, groupby="item"): def generate_top_boot_failing(data): - tabs = dbc.Tabs( [ dbc.Tab( @@ -567,7 +564,6 @@ def generate_dmesg_errors(data): def generate_pytest_results(data): - tabs = dbc.Tabs( [ dbc.Tab( @@ -648,7 +644,6 @@ def generate_panel(data): def report_tabs(data, active_tab="t_summary"): - tabs = dbc.Tabs( [ dbc.Tab( From e0da11332c5f30595586cb038fd973b5c89491ea Mon Sep 17 00:00:00 2001 From: Say Date: Wed, 19 Feb 2025 00:25:42 -0500 Subject: [PATCH 5/5] modify CORS setting Signed-off-by: Say --- app/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/__init__.py b/app/__init__.py index 1507b3a..5455d16 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -7,7 +7,7 @@ def create_app(): server = Flask(__name__) - CORS(server) + CORS(server, resources={r"/*": {"origins": "*"}}) register_dashapps(server) # register_extensions(server)