From 3948de7ac3ce79740d420ac4930fdf1e820c60ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Fu=C3=9Fberger?= Date: Fri, 28 Aug 2026 07:38:13 +0200 Subject: [PATCH 1/3] Update to lifecycle 0.4.0 --- MODULE.bazel.lock | 15 ++++++++++++--- bazel_common/score_modules_target_sw.MODULE.bazel | 2 +- bazel_common/score_modules_tooling.MODULE.bazel | 2 +- known_good.json | 4 ++-- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 8b3ee03d415..e4ee466df1d 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -316,6 +316,7 @@ "https://bcr.bazel.build/modules/opentracing-cpp/1.6.0/MODULE.bazel": "b3925269f63561b8b880ae7cf62ccf81f6ece55b62cd791eda9925147ae116ec", "https://bcr.bazel.build/modules/opentracing-cpp/1.6.0/source.json": "da1cb1add160f5e5074b7272e9db6fd8f1b3336c15032cd0a653af9d2f484aed", "https://bcr.bazel.build/modules/package_metadata/0.0.2/MODULE.bazel": "fb8d25550742674d63d7b250063d4580ca530499f045d70748b1b142081ebb92", + "https://bcr.bazel.build/modules/package_metadata/0.0.3/MODULE.bazel": "77890552ecea9e284b5424c9de827a58099348763a4359e975c359a83d4faa83", "https://bcr.bazel.build/modules/package_metadata/0.0.6/MODULE.bazel": "341dab6f417197494517d54c8e557c0baee1de7aec83543a4fbefe57900acb7e", "https://bcr.bazel.build/modules/package_metadata/0.0.7/MODULE.bazel": "7adb03933fc8401f495800cf4eafcff0edc6da0ff55c7db223ef69d19f689486", "https://bcr.bazel.build/modules/package_metadata/0.0.7/source.json": "50639625e937b56115012674c797cca7a05a96b4878c87d803c13dc2b31de8a0", @@ -328,7 +329,8 @@ "https://bcr.bazel.build/modules/platforms/0.0.8/MODULE.bazel": "9f142c03e348f6d263719f5074b21ef3adf0b139ee4c5133e2aa35664da9eb2d", "https://bcr.bazel.build/modules/platforms/0.0.9/MODULE.bazel": "4a87a60c927b56ddd67db50c89acaa62f4ce2a1d2149ccb63ffd871d5ce29ebc", "https://bcr.bazel.build/modules/platforms/1.0.0/MODULE.bazel": "f05feb42b48f1b3c225e4ccf351f367be0371411a803198ec34a389fb22aa580", - "https://bcr.bazel.build/modules/platforms/1.0.0/source.json": "f4ff1fd412e0246fd38c82328eb209130ead81d62dcd5a9e40910f867f733d96", + "https://bcr.bazel.build/modules/platforms/1.1.0/MODULE.bazel": "1c0c09f5bdcf4b3f924720d2478a3711cb39f4977019ca5988685e5b7e18b3d2", + "https://bcr.bazel.build/modules/platforms/1.1.0/source.json": "fcf351c47596c939140ab0d333dfdd08ed1ea6ce33c2fe70c12493a301cf1344", "https://bcr.bazel.build/modules/prometheus-cpp/1.2.4/MODULE.bazel": "0fbe5dcff66311947a3f6b86ebc6a6d9328e31a28413ca864debc4a043f371e5", "https://bcr.bazel.build/modules/prometheus-cpp/1.3.0/MODULE.bazel": "ce82e086bbc0b60267e970f6a54b2ca6d0f22d3eb6633e00e2cc2899c700f3d8", "https://bcr.bazel.build/modules/prometheus-cpp/1.3.0/source.json": "8cb66b4e535afc718e9d104a3db96ccb71a42ee816a100e50fd0d5ac843c0606", @@ -535,6 +537,8 @@ "https://bcr.bazel.build/modules/rules_swift/1.18.0/MODULE.bazel": "a6aba73625d0dc64c7b4a1e831549b6e375fbddb9d2dde9d80c9de6ec45b24c9", "https://bcr.bazel.build/modules/rules_swift/2.1.1/MODULE.bazel": "494900a80f944fc7aa61500c2073d9729dff0b764f0e89b824eb746959bc1046", "https://bcr.bazel.build/modules/rules_swift/2.1.1/source.json": "40fc69dfaac64deddbb75bd99cdac55f4427d9ca0afbe408576a65428427a186", + "https://bcr.bazel.build/modules/sphinxdocs/2.2.0/MODULE.bazel": "e046c573919d72605d62c352a08d9223a10aafef3a7cb70d0fe253ebdd97019e", + "https://bcr.bazel.build/modules/sphinxdocs/2.2.0/source.json": "b1da19a3d14a1dd8aa6a9ccaedc42bbe0313c8160a77ba5cca336cca1315298d", "https://bcr.bazel.build/modules/stardoc/0.5.0/MODULE.bazel": "f9f1f46ba8d9c3362648eea571c6f9100680efc44913618811b58cc9c02cd678", "https://bcr.bazel.build/modules/stardoc/0.5.1/MODULE.bazel": "1a05d92974d0c122f5ccf09291442580317cdd859f07a8655f1db9a60374f9f8", "https://bcr.bazel.build/modules/stardoc/0.5.3/MODULE.bazel": "c7f6948dae6999bf0db32c1858ae345f112cacf98f174c7a8bb707e41b974f1c", @@ -800,6 +804,7 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/opentelemetry-proto/1.4.0.bcr.1/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/opentracing-cpp/1.6.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/package_metadata/0.0.2/MODULE.bazel": "not found", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/package_metadata/0.0.3/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/package_metadata/0.0.6/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/package_metadata/0.0.7/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/platforms/0.0.10/MODULE.bazel": "not found", @@ -811,6 +816,7 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/platforms/0.0.8/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/platforms/0.0.9/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/platforms/1.0.0/MODULE.bazel": "not found", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/platforms/1.1.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/prometheus-cpp/1.2.4/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/prometheus-cpp/1.3.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/protobuf/21.7/MODULE.bazel": "not found", @@ -994,8 +1000,10 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_swift/2.1.1/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_bazel_cpp_toolchains/0.5.4/MODULE.bazel": "5f14457f9b708302db05b5dc3c07bd41ae19b91cabf98a0dbffdca622bd6ac91", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_bazel_cpp_toolchains/0.5.4/source.json": "2946be24c6b978aa788c934643aa7ec68aac4a926bea4eaa81d512fd48e9f4a8", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_devcontainer/1.8.0/MODULE.bazel": "89f855b94d041d2e61ff9667562fb4539c146249f6fb4c5dddf3d13bb9064aa7", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_devcontainer/1.8.0/source.json": "ef316fad71fdbd53daf43fc0a82fbc7c293908a2712214ff79134c177d028024", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_devcontainer/1.11.0/MODULE.bazel": "fb6041c96e949a151307b4690ee81cf5d9254d6bf79540184b16567b04397171", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_devcontainer/1.11.0/source.json": "b379a2499cf06f16de65c2981665c3723afba9e858ed16b453f044882067f56f", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_process_description/2.1.2/MODULE.bazel": "1076b36d2d05ab1a18df0746f6a545869eec6927019d651af99d99ef056e2023", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_process_description/2.1.2/source.json": "f76099f076243e2641803971e2a95ed27f24756c9bdda5d10a808c664996f0fc", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_python_basics/0.3.4/MODULE.bazel": "53bd16dfbb1fb8ecf6822fb26f9f4e8333bac7b14d12bb02bf84078063820a31", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_python_basics/0.3.4/source.json": "28ed0207a16f8498a84fae4983fa73060805003a4fbd68c6d749e2f1cc14601f", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_qnx_unit_tests/0.2.0/MODULE.bazel": "aaffff67916dd058737aac8e04368f12b214e7646ff58adbab48e6429d1a5410", @@ -1008,6 +1016,7 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_rust_policies/0.0.5/source.json": "22c8bf0a5cbf7c7b06f774f3f66498e0bc14346a8b2208f7427a8fbb78a42547", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_toolchains_rust/0.8.0/MODULE.bazel": "ea57a9a4dcb8ad49f4556f824500eb559365f413ccbb39d70d0b363685aacec5", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_toolchains_rust/0.8.0/source.json": "394a615e03ad722bc27bd4a6f098c6ff2fe7120b69cdf3925d47e39d30ada8a4", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/sphinxdocs/2.2.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/stardoc/0.5.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/stardoc/0.5.1/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/stardoc/0.5.3/MODULE.bazel": "not found", diff --git a/bazel_common/score_modules_target_sw.MODULE.bazel b/bazel_common/score_modules_target_sw.MODULE.bazel index 70634a40c99..b6bfad93058 100644 --- a/bazel_common/score_modules_target_sw.MODULE.bazel +++ b/bazel_common/score_modules_target_sw.MODULE.bazel @@ -68,7 +68,7 @@ git_override( bazel_dep(name = "score_lifecycle_health") git_override( module_name = "score_lifecycle_health", - commit = "23e9849437c578ade99b8ccbf5d09c1835737b3f", + commit = "4ff5d77cf4b63ae3c24ede568d02df10dea41ce2", remote = "https://github.com/eclipse-score/lifecycle.git", ) diff --git a/bazel_common/score_modules_tooling.MODULE.bazel b/bazel_common/score_modules_tooling.MODULE.bazel index 643c3a62376..0b1aaaa6a59 100644 --- a/bazel_common/score_modules_tooling.MODULE.bazel +++ b/bazel_common/score_modules_tooling.MODULE.bazel @@ -59,7 +59,7 @@ git_override( bazel_dep(name = "score_docs_as_code") git_override( module_name = "score_docs_as_code", - commit = "f1f20f0579ab5e63513561db0ab055cbec46c987", + commit = "b4eab4cd5d3fa0479c3fa8fbb9d0116641f17dbf", remote = "https://github.com/eclipse-score/docs-as-code.git", ) diff --git a/known_good.json b/known_good.json index 9389a21a057..a2e8b667e8b 100644 --- a/known_good.json +++ b/known_good.json @@ -91,7 +91,7 @@ }, "score_lifecycle_health": { "repo": "https://github.com/eclipse-score/lifecycle.git", - "hash": "23e9849437c578ade99b8ccbf5d09c1835737b3f", + "hash": "4ff5d77cf4b63ae3c24ede568d02df10dea41ce2", "bazel_patches": [], "metadata": { "code_root_path": "//score/...", @@ -189,7 +189,7 @@ }, "score_docs_as_code": { "repo": "https://github.com/eclipse-score/docs-as-code.git", - "hash": "f1f20f0579ab5e63513561db0ab055cbec46c987" + "hash": "b4eab4cd5d3fa0479c3fa8fbb9d0116641f17dbf" }, "score_process": { "repo": "https://github.com/eclipse-score/process_description.git", From 9576beed9457a2e8bc7aac2700a6aa33561f0a6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Fu=C3=9Fberger?= Date: Fri, 28 Aug 2026 09:16:30 +0200 Subject: [PATCH 2/3] Remove exclusion of removed tests --- known_good.json | 4 +--- rust_coverage/BUILD | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/known_good.json b/known_good.json index a2e8b667e8b..a6da8f92615 100644 --- a/known_good.json +++ b/known_good.json @@ -96,9 +96,7 @@ "metadata": { "code_root_path": "//score/...", "exclude_test_targets": [ - "//score/health_monitor/src/rust:miri_tests", - "//score/launch_manager/src/daemon/src/common/concurrency:mpmc_concurrent_queue_tsan_test", - "//score/launch_manager/src/daemon/src/common/concurrency:mpsc_bounded_queue_tsan_test" + "//score/health_monitor/src/rust:miri_tests" ] } }, diff --git a/rust_coverage/BUILD b/rust_coverage/BUILD index 3cdb06861b8..a724f89197d 100644 --- a/rust_coverage/BUILD +++ b/rust_coverage/BUILD @@ -62,7 +62,7 @@ rust_coverage_report( "linux-x86_64", "ferrocene-coverage", ], - query = 'kind("rust_test", @score_lifecycle_health//score/...) -@score_lifecycle_health//score/health_monitor/src/rust:miri_tests -@score_lifecycle_health//score/launch_manager/src/daemon/src/common/concurrency:mpmc_concurrent_queue_tsan_test -@score_lifecycle_health//score/launch_manager/src/daemon/src/common/concurrency:mpsc_bounded_queue_tsan_test', + query = 'kind("rust_test", @score_lifecycle_health//score/...) -@score_lifecycle_health//score/health_monitor/src/rust:miri_tests', visibility = ["//visibility:public"], ) From 6378789e73e50d94e7a9d5ca5da4f26cd919b53a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Fu=C3=9Fberger?= Date: Fri, 28 Aug 2026 09:29:32 +0200 Subject: [PATCH 3/3] Temporarily patch config manager for lifecycle --- .../score_modules_target_sw.MODULE.bazel | 1 + known_good.json | 3 +- ...e-lifecycle-mock-targets-and-headers.patch | 62 +++++++++++++++++++ 3 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 patches/config_management/002-rename-lifecycle-mock-targets-and-headers.patch diff --git a/bazel_common/score_modules_target_sw.MODULE.bazel b/bazel_common/score_modules_target_sw.MODULE.bazel index b6bfad93058..c735aa18f49 100644 --- a/bazel_common/score_modules_target_sw.MODULE.bazel +++ b/bazel_common/score_modules_target_sw.MODULE.bazel @@ -104,6 +104,7 @@ git_override( patch_strip = 1, patches = [ "patches/config_management/001-adapt-proxy-api-and-remove-internal-targets.patch", + "patches/config_management/002-rename-lifecycle-mock-targets-and-headers.patch", ], remote = "https://github.com/eclipse-score/config_management.git", ) diff --git a/known_good.json b/known_good.json index a6da8f92615..4c0d896e143 100644 --- a/known_good.json +++ b/known_good.json @@ -140,7 +140,8 @@ "repo": "https://github.com/eclipse-score/config_management.git", "hash": "952461ceffff774fb4c125ee023fea0221fcdce2", "bazel_patches": [ - "patches/config_management/001-adapt-proxy-api-and-remove-internal-targets.patch" + "patches/config_management/001-adapt-proxy-api-and-remove-internal-targets.patch", + "patches/config_management/002-rename-lifecycle-mock-targets-and-headers.patch" ], "metadata": { "code_root_path": "//score/config_management/...", diff --git a/patches/config_management/002-rename-lifecycle-mock-targets-and-headers.patch b/patches/config_management/002-rename-lifecycle-mock-targets-and-headers.patch new file mode 100644 index 00000000000..8656691da71 --- /dev/null +++ b/patches/config_management/002-rename-lifecycle-mock-targets-and-headers.patch @@ -0,0 +1,62 @@ +diff --git a/bazel/patches/wire_unit_test_to_lobster.patch b/bazel/patches/wire_unit_test_to_lobster.patch +--- a/bazel/patches/wire_unit_test_to_lobster.patch ++++ b/bazel/patches/wire_unit_test_to_lobster.patch +@@ -31,7 +31,7 @@ + cc_library( + name = "app", + @@ -85,3 +86,11 @@ +- "@score_lifecycle_health//score/launch_manager:lifecycle_mock_cc", ++ "@score_lifecycle_health//score/launch_manager:mock_lifecycle_cc", + ], + ) + + +diff --git a/score/config_management/config_daemon/code/BUILD b/score/config_management/config_daemon/code/BUILD +--- a/score/config_management/config_daemon/code/BUILD ++++ b/score/config_management/config_daemon/code/BUILD +@@ -41,8 +41,8 @@ + tags = ["unit"], + deps = [ + "//score/config_management/config_daemon/code/app/details:app_for_unit_test", +- "@score_lifecycle_health//score/launch_manager:applicationcontext_mock_cc", +- "@score_lifecycle_health//score/launch_manager:lifecycle_mock_cc", ++ "@score_lifecycle_health//score/launch_manager:mock_application_context_cc", ++ "@score_lifecycle_health//score/launch_manager:mock_lifecycle_cc", + "@score_lifecycle_health//score/launch_manager:runapplication_cc", + ] + select({ + ":is_score_variant": ["//score/config_management/config_daemon/code/factory/details:mw_factory_for_unit_test"], +diff --git a/score/config_management/config_daemon/code/app/details/BUILD b/score/config_management/config_daemon/code/app/details/BUILD +--- a/score/config_management/config_daemon/code/app/details/BUILD ++++ b/score/config_management/config_daemon/code/app/details/BUILD +@@ -53,7 +53,7 @@ + "//score/config_management/config_daemon/code/fault_event_reporter", + "@score_baselibs//score/scope_exit", + "@score_lifecycle_health//score/launch_manager:application_cc", +- "@score_lifecycle_health//score/launch_manager:applicationcontext_mock_cc", ++ "@score_lifecycle_health//score/launch_manager:mock_application_context_cc", + "@score_logging//score/mw/log", + ], + ) +@@ -84,6 +84,6 @@ + "@score_communication//score/mw/service:factory", + "@score_communication//score/mw/service:provided_service_container", + "@score_lifecycle_health//score/launch_manager:applicationcontext_cc", +- "@score_lifecycle_health//score/launch_manager:lifecycle_mock_cc", ++ "@score_lifecycle_health//score/launch_manager:mock_lifecycle_cc", + ], + ) +diff --git a/score/config_management/config_daemon/code/main_test.cpp b/score/config_management/config_daemon/code/main_test.cpp +--- a/score/config_management/config_daemon/code/main_test.cpp ++++ b/score/config_management/config_daemon/code/main_test.cpp +@@ -13,9 +13,9 @@ + + #include "score/config_management/config_daemon/code/app/config_daemon.h" + +-#include "score/mw/lifecycle/applicationcontextmock.h" +-#include "score/mw/lifecycle/mwlifecyclemanagermock.h" +-#include "score/mw/lifecycle/lifecyclemanagermock.h" ++#include "score/mw/lifecycle/mock_application_context.h" ++#include "score/mw/lifecycle/mock_mw_lifecycle_manager.h" ++#include "score/mw/lifecycle/mock_lifecycle_manager.h" + + #include + #include