From 568f1c752e34093e52c414842a6defffb5ff911a Mon Sep 17 00:00:00 2001 From: "Negm Adham (ETAS-ECM/ESY3)" Date: Tue, 14 Apr 2026 17:29:58 +0200 Subject: [PATCH 1/3] Update FMEA and DFA meta model --- src/extensions/score_metamodel/metamodel.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/extensions/score_metamodel/metamodel.yaml b/src/extensions/score_metamodel/metamodel.yaml index a7a28c66a..49faadc3c 100644 --- a/src/extensions/score_metamodel/metamodel.yaml +++ b/src/extensions/score_metamodel/metamodel.yaml @@ -736,6 +736,7 @@ needs_types: violates: feat_arc_sta optional_options: mitigation_issue: ^https://github.com/.*$ + safety_relevant: ^.*$ optional_links: mitigated_by: stkh_req, aou_req parts: 3 @@ -810,6 +811,9 @@ needs_types: optional_options: # req-Id: tool_req__docs_saf_attrs_mitigation_issue mitigation_issue: ^https://github.com/.*$ + # Added for persistency FMEA + safety_relevant: ^.*$ + root_cause: ^.*$ mandatory_links: # req-Id: tool_req__docs_saf_attrs_violates violates: feat_arc_dyn From 0cd061adc9a1400f9a4675a5508d86ef5a0b1ea7 Mon Sep 17 00:00:00 2001 From: "Negm Adham (ETAS-ECM/ESY3)" Date: Tue, 14 Apr 2026 17:43:26 +0200 Subject: [PATCH 2/3] update meta model for platform,feature and component artifacts --- src/extensions/score_metamodel/metamodel.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/extensions/score_metamodel/metamodel.yaml b/src/extensions/score_metamodel/metamodel.yaml index 49faadc3c..208b1a99b 100644 --- a/src/extensions/score_metamodel/metamodel.yaml +++ b/src/extensions/score_metamodel/metamodel.yaml @@ -736,7 +736,7 @@ needs_types: violates: feat_arc_sta optional_options: mitigation_issue: ^https://github.com/.*$ - safety_relevant: ^.*$ + safety_relevant: ^(yes|no)$ optional_links: mitigated_by: stkh_req, aou_req parts: 3 @@ -759,6 +759,7 @@ needs_types: optional_options: # req-Id: tool_req__docs_saf_attrs_mitigation_issue mitigation_issue: ^https://github.com/.*$ + safety_relevant: ^(yes|no)$ optional_links: # req-Id: tool_req__docs_saf_attrs_mitigated_by # (only mandatory once valid status == valid) @@ -783,6 +784,7 @@ needs_types: optional_options: # req-Id: tool_req__docs_saf_attrs_mitigation_issue mitigation_issue: ^https://github.com/.*$ + safety_relevant: ^(yes|no)$ mandatory_links: # req-Id: tool_req__docs_saf_attrs_violates violates: comp_arc_sta @@ -811,9 +813,8 @@ needs_types: optional_options: # req-Id: tool_req__docs_saf_attrs_mitigation_issue mitigation_issue: ^https://github.com/.*$ - # Added for persistency FMEA - safety_relevant: ^.*$ - root_cause: ^.*$ + safety_relevant: ^(yes|no)$ + root_cause: ^[\s\S]+$ mandatory_links: # req-Id: tool_req__docs_saf_attrs_violates violates: feat_arc_dyn @@ -841,6 +842,8 @@ needs_types: optional_options: # req-Id: tool_req__docs_saf_attrs_mitigation_issue mitigation_issue: ^https://github.com/.*$ + safety_relevant: ^(yes|no)$ + root_cause: ^[\s\S]+$ mandatory_links: # req-Id: tool_req__docs_saf_attrs_violates violates: comp_arc_dyn From f6e79e0e31086409202a55c11ace60db8450a89a Mon Sep 17 00:00:00 2001 From: "Negm Adham (ETAS-ECM/ESY3)" Date: Wed, 15 Apr 2026 11:27:04 +0200 Subject: [PATCH 3/3] fix multiple override error --- src/tests/test_consumer.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/tests/test_consumer.py b/src/tests/test_consumer.py index ad6d53b21..cceef1117 100644 --- a/src/tests/test_consumer.py +++ b/src/tests/test_consumer.py @@ -199,7 +199,8 @@ def filter_repos(repo_filter: str | None) -> list[ConsumerRepo]: def comment_out_git_override(module_content: str) -> str: """ - Comment out existing git_override blocks for score_docs_as_code only. + Comment out existing override blocks for score_docs_as_code only. + Handles git_override, single_version_override, local_path_override, archive_override, etc. """ lines = module_content.splitlines() result = [] @@ -208,8 +209,8 @@ def comment_out_git_override(module_content: str) -> str: while i < len(lines): line = lines[i] - # Check if this line starts a git_override block - if re.match(r"^\s*git_override\s*\(", line): + # Check if this line starts any *_override block + if re.match(r"^\s*\w+_override\s*\(", line): # Collect the entire block block_start = i depth = line.count("(") - line.count(")")