From 77d59edc063ee0eea642c9e8dbdaf6b036062e0b Mon Sep 17 00:00:00 2001 From: subramaniak Date: Tue, 13 Oct 2026 09:14:21 +0000 Subject: [PATCH 1/5] chore: update score_test_scenarios consumers to score/ paths --- bazel_common/score_modules_tooling.MODULE.bazel | 2 +- feature_integration_tests/test_scenarios/cpp/BUILD | 2 +- feature_integration_tests/test_scenarios/rust/BUILD | 2 +- known_good.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bazel_common/score_modules_tooling.MODULE.bazel b/bazel_common/score_modules_tooling.MODULE.bazel index 6e0805d39df..042d271e567 100644 --- a/bazel_common/score_modules_tooling.MODULE.bazel +++ b/bazel_common/score_modules_tooling.MODULE.bazel @@ -66,7 +66,7 @@ git_override( bazel_dep(name = "score_test_scenarios") git_override( module_name = "score_test_scenarios", - commit = "fec712d490ff5d46fae91332bafac4777b300026", + commit = "c16400a3f7c71ca26b67965c5e7469560b6de496", remote = "https://github.com/eclipse-score/testing_tools.git", ) diff --git a/feature_integration_tests/test_scenarios/cpp/BUILD b/feature_integration_tests/test_scenarios/cpp/BUILD index 3f06998b7f6..21a883bca47 100644 --- a/feature_integration_tests/test_scenarios/cpp/BUILD +++ b/feature_integration_tests/test_scenarios/cpp/BUILD @@ -26,6 +26,6 @@ cc_binary( "@score_baselibs//score/json", "@score_baselibs//score/mw/log:backend_stub_testutil", "@score_persistency//:kvs_cpp", - "@score_test_scenarios//test_scenarios_cpp", + "@score_test_scenarios//score/test_scenarios_cpp", ], ) diff --git a/feature_integration_tests/test_scenarios/rust/BUILD b/feature_integration_tests/test_scenarios/rust/BUILD index b23163de7cf..2eae1aa03a7 100644 --- a/feature_integration_tests/test_scenarios/rust/BUILD +++ b/feature_integration_tests/test_scenarios/rust/BUILD @@ -26,6 +26,6 @@ rust_binary( "@score_crates//:tracing", "@score_crates//:tracing_subscriber", "@score_persistency//score/kvs/rust_kvs", - "@score_test_scenarios//test_scenarios_rust", + "@score_test_scenarios//score/test_scenarios_rust", ], ) diff --git a/known_good.json b/known_good.json index c2925e25e17..2fdf4e3150a 100644 --- a/known_good.json +++ b/known_good.json @@ -228,7 +228,7 @@ "score_test_scenarios": { "repo": "https://github.com/eclipse-score/testing_tools.git", "docs": false, - "hash": "fec712d490ff5d46fae91332bafac4777b300026" + "hash": "c16400a3f7c71ca26b67965c5e7469560b6de496" }, "score_docs_as_code": { "repo": "https://github.com/eclipse-score/docs-as-code.git", From 9b9bb964e66313ab3fe147ef0e3165bdcb95994b Mon Sep 17 00:00:00 2001 From: subramaniak Date: Tue, 13 Oct 2026 10:34:45 +0000 Subject: [PATCH 2/5] fix: patch score_persistency build paths and pin score_devcontainer to fix CI --- .../score_modules_target_sw.MODULE.bazel | 1 + .../score_test_artifact_versions.MODULE.bazel | 7 ++++++ known_good.json | 3 ++- .../007-use-score-test-scenarios-paths.patch | 24 +++++++++++++++++++ 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 patches/persistency/007-use-score-test-scenarios-paths.patch diff --git a/bazel_common/score_modules_target_sw.MODULE.bazel b/bazel_common/score_modules_target_sw.MODULE.bazel index 7cfe7dd45ff..a4284304d13 100644 --- a/bazel_common/score_modules_target_sw.MODULE.bazel +++ b/bazel_common/score_modules_target_sw.MODULE.bazel @@ -47,6 +47,7 @@ git_override( patch_strip = 1, patches = [ "//patches/persistency:003-undev-deps-for-root-module.patch", + "//patches/persistency:007-use-score-test-scenarios-paths.patch", ], remote = "https://github.com/eclipse-score/persistency.git", ) diff --git a/bazel_common/score_test_artifact_versions.MODULE.bazel b/bazel_common/score_test_artifact_versions.MODULE.bazel index e860cb7c186..065ff9cac52 100644 --- a/bazel_common/score_test_artifact_versions.MODULE.bazel +++ b/bazel_common/score_test_artifact_versions.MODULE.bazel @@ -39,3 +39,10 @@ single_version_override( module_name = "score_toolchains_rust", version = "0.8.0", ) + +# score_devcontainer 1.11.1 was republished; its tarball hash in the registry no longer +# matches the actual archive at v1.11.1. Pin to 1.11.0 (v1.11.0.tar.gz) which is stable. +single_version_override( + module_name = "score_devcontainer", + version = "1.11.0", +) diff --git a/known_good.json b/known_good.json index 2fdf4e3150a..8b409d4cde5 100644 --- a/known_good.json +++ b/known_good.json @@ -61,7 +61,8 @@ "score_persistency": { "repo": "https://github.com/eclipse-score/persistency.git", "bazel_patches": [ - "//patches/persistency:003-undev-deps-for-root-module.patch" + "//patches/persistency:003-undev-deps-for-root-module.patch", + "//patches/persistency:007-use-score-test-scenarios-paths.patch" ], "metadata": { "code_root_path": "//score/kvs/...", diff --git a/patches/persistency/007-use-score-test-scenarios-paths.patch b/patches/persistency/007-use-score-test-scenarios-paths.patch new file mode 100644 index 00000000000..0845686f711 --- /dev/null +++ b/patches/persistency/007-use-score-test-scenarios-paths.patch @@ -0,0 +1,24 @@ +diff --git a/score/kvs/tests/test_scenarios/cpp/BUILD b/score/kvs/tests/test_scenarios/cpp/BUILD +--- a/score/kvs/tests/test_scenarios/cpp/BUILD ++++ b/score/kvs/tests/test_scenarios/cpp/BUILD +@@ -26,7 +26,7 @@ + visibility = ["//visibility:public"], + deps = [ + "//score/kvs:kvs_cpp", + "@score_baselibs//score/mw/log:backend_stub_testutil", +- "@score_test_scenarios//test_scenarios_cpp", ++ "@score_test_scenarios//score/test_scenarios_cpp", + ], + ) +diff --git a/score/kvs/tests/test_scenarios/rust/BUILD b/score/kvs/tests/test_scenarios/rust/BUILD +--- a/score/kvs/tests/test_scenarios/rust/BUILD ++++ b/score/kvs/tests/test_scenarios/rust/BUILD +@@ -30,7 +30,7 @@ + "@score_crates//:tinyjson", + "@score_crates//:tracing", + "@score_crates//:tracing_subscriber", + "@score_logging//score/mw/log/rust/score_log_bridge", +- "@score_test_scenarios//test_scenarios_rust", ++ "@score_test_scenarios//score/test_scenarios_rust", + ], + ) From 2dfa2461baa4f8a4192e438cbd3bff5b878f2f12 Mon Sep 17 00:00:00 2001 From: subramaniak Date: Thu, 15 Oct 2026 06:22:21 +0000 Subject: [PATCH 3/5] fix: remove score_devcontainer override no longer in dependency graph --- bazel_common/score_test_artifact_versions.MODULE.bazel | 7 ------- 1 file changed, 7 deletions(-) diff --git a/bazel_common/score_test_artifact_versions.MODULE.bazel b/bazel_common/score_test_artifact_versions.MODULE.bazel index 065ff9cac52..e860cb7c186 100644 --- a/bazel_common/score_test_artifact_versions.MODULE.bazel +++ b/bazel_common/score_test_artifact_versions.MODULE.bazel @@ -39,10 +39,3 @@ single_version_override( module_name = "score_toolchains_rust", version = "0.8.0", ) - -# score_devcontainer 1.11.1 was republished; its tarball hash in the registry no longer -# matches the actual archive at v1.11.1. Pin to 1.11.0 (v1.11.0.tar.gz) which is stable. -single_version_override( - module_name = "score_devcontainer", - version = "1.11.0", -) From 1299eec2293c89b038d1555d83d8bf63151be9c2 Mon Sep 17 00:00:00 2001 From: subramaniak Date: Wed, 21 Oct 2026 03:41:03 +0000 Subject: [PATCH 4/5] chore: bump score_persistency to merged PR#512 commit, drop patch 007 --- MODULE.bazel.lock | 24 ++++--- .../score_modules_target_sw.MODULE.bazel | 4 +- .../test_scenarios/cpp/BUILD | 2 +- .../internals/persistency/kvs_build_helpers.h | 22 +++--- .../internals/persistency/kvs_instance.cpp | 20 +++--- .../src/internals/persistency/kvs_instance.h | 2 +- known_good.json | 9 ++- ...03-migrate-kvs-to-full-include-paths.patch | 70 +++++++++++++++++++ .../003-undev-deps-for-root-module.patch | 15 ++-- .../007-use-score-test-scenarios-paths.patch | 24 ------- rust_coverage/BUILD | 2 +- 11 files changed, 125 insertions(+), 69 deletions(-) create mode 100644 patches/config_management/003-migrate-kvs-to-full-include-paths.patch delete mode 100644 patches/persistency/007-use-score-test-scenarios-paths.patch diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index d18937b941f..1cd8996a95b 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -25,7 +25,9 @@ "https://bcr.bazel.build/modules/apple_support/1.22.1/MODULE.bazel": "90bd1a660590f3ceffbdf524e37483094b29352d85317060b2327fff8f3f4458", "https://bcr.bazel.build/modules/apple_support/1.23.1/MODULE.bazel": "53763fed456a968cf919b3240427cf3a9d5481ec5466abc9d5dc51bc70087442", "https://bcr.bazel.build/modules/apple_support/1.24.1/MODULE.bazel": "f46e8ddad60aef170ee92b2f3d00ef66c147ceafea68b6877cb45bd91737f5f8", - "https://bcr.bazel.build/modules/apple_support/1.24.1/source.json": "cf725267cbacc5f028ef13bb77e7f2c2e0066923a4dab1025e4a0511b1ed258a", + "https://bcr.bazel.build/modules/apple_support/2.8.0/MODULE.bazel": "c45f5176057092afba0be6c48a9ea02101666802f8be536947e099e94757f8ed", + "https://bcr.bazel.build/modules/apple_support/2.9.1/MODULE.bazel": "fb209b83ed172af587419acb3340389cfe3260669e5f1c05e1ac3974aca614e0", + "https://bcr.bazel.build/modules/apple_support/2.9.1/source.json": "247d9f86d94c546533fb01e6e18b018486f9a6dff5faccae8838ef12e659b2a7", "https://bcr.bazel.build/modules/aspect_bazel_lib/1.31.2/MODULE.bazel": "7bee702b4862612f29333590f4b658a5832d433d6f8e4395f090e8f4e85d442f", "https://bcr.bazel.build/modules/aspect_bazel_lib/1.38.0/MODULE.bazel": "6307fec451ba9962c1c969eb516ebfe1e46528f7fa92e1c9ac8646bef4cdaa3f", "https://bcr.bazel.build/modules/aspect_bazel_lib/1.42.2/MODULE.bazel": "2e0d8ab25c57a14f56ace1c8e881b69050417ff91b2fb7718dc00d201f3c3478", @@ -403,8 +405,10 @@ "https://bcr.bazel.build/modules/rules_cc/0.2.14/MODULE.bazel": "353c99ed148887ee89c54a17d4100ae7e7e436593d104b668476019023b58df8", "https://bcr.bazel.build/modules/rules_cc/0.2.16/MODULE.bazel": "9242fa89f950c6ef7702801ab53922e99c69b02310c39fb6e62b2bd30df2a1d4", "https://bcr.bazel.build/modules/rules_cc/0.2.17/MODULE.bazel": "1849602c86cb60da8613d2de887f9566a6d354a6df6d7009f9d04a14402f9a84", - "https://bcr.bazel.build/modules/rules_cc/0.2.22/MODULE.bazel": "94df4328edef9e44d38de5e73b037cd348e75e7ae55f4e21bf07878c41a31ebb", - "https://bcr.bazel.build/modules/rules_cc/0.2.22/source.json": "b2d6d6f9c332ce269ad75b89c6f3168d809a66173c9040210fb9bcc733ab42fa", + "https://bcr.bazel.build/modules/rules_cc/0.2.20/MODULE.bazel": "f5c07bce5ddcb99be21a0812ff5aadb439e688b7449c6542152363b2fd859c1a", + "https://bcr.bazel.build/modules/rules_cc/0.2.25/MODULE.bazel": "4a3d4f3606d3b3190be495dbc497acca552807d1d5540661ef0d1658472882e3", + "https://bcr.bazel.build/modules/rules_cc/0.2.26/MODULE.bazel": "a9f7b7f4a52747910965bddb1f58fc1fef50604ed1980ebdd16ea6f446d92249", + "https://bcr.bazel.build/modules/rules_cc/0.2.26/source.json": "bf9ff315da6055c1e374d627012cc51947a05b3560674af7d69fbedbb4fde6ef", "https://bcr.bazel.build/modules/rules_cc/0.2.4/MODULE.bazel": "1ff1223dfd24f3ecf8f028446d4a27608aa43c3f41e346d22838a4223980b8cc", "https://bcr.bazel.build/modules/rules_cc/0.2.8/MODULE.bazel": "f1df20f0bf22c28192a794f29b501ee2018fa37a3862a1a2132ae2940a23a642", "https://bcr.bazel.build/modules/rules_diff/1.0.0/MODULE.bazel": "1739509d8db9a6cd7d3584822340d3dfe1f9f27e62462fbca60aa061d88741b2", @@ -609,6 +613,8 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/apple_support/1.22.1/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/apple_support/1.23.1/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/apple_support/1.24.1/MODULE.bazel": "not found", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/apple_support/2.8.0/MODULE.bazel": "not found", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/apple_support/2.9.1/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/aspect_bazel_lib/1.31.2/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/aspect_bazel_lib/1.38.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/aspect_bazel_lib/1.42.2/MODULE.bazel": "not found", @@ -883,7 +889,9 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_cc/0.2.14/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_cc/0.2.16/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_cc/0.2.17/MODULE.bazel": "not found", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_cc/0.2.22/MODULE.bazel": "not found", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_cc/0.2.20/MODULE.bazel": "not found", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_cc/0.2.25/MODULE.bazel": "not found", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_cc/0.2.26/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_cc/0.2.4/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_cc/0.2.8/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_diff/1.0.0/MODULE.bazel": "not found", @@ -1007,8 +1015,6 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_swift/1.16.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/rules_swift/1.18.0/MODULE.bazel": "not found", "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_format_checker/0.1.1/MODULE.bazel": "1acc254faa90e9f97b79ac69af25b6c21c561f8d6079914f6352b9b20d26bd37", - "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_format_checker/0.1.1/source.json": "e3d10be878d1a007967b75a5c6d9c3ec3d47c320685904b7f31c689b3cbcdb3a", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_itf/0.6.0/MODULE.bazel": "84fe2438bde5db32cbcfca5db1194a56fd753f69e5466cf8e46aada7f209e613", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_itf/0.6.0/source.json": "59e6efe70c81dbda18631020035bcedc1d92ee86bcae5965989ee5126aa78c92", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/score_process/2.0.2/MODULE.bazel": "6d2b227bb6880e9f6871cc8cf94c83399e35c188424f7e9b826262de8149ed43", @@ -1539,7 +1545,7 @@ }, "@@bazel_jar_jar+//internal:non_module_deps.bzl%non_module_deps": { "general": { - "bzlTransitiveDigest": "HfYvHyph4US1Rb9jKW7AUfDbE5p9915R85CJ0c14mrk=", + "bzlTransitiveDigest": "WKp1gL89DpGSSx+oIwtE0toTaqU5pfTzmQSNhxgCEwk=", "usagesDigest": "P1uSZ4XnqOp90Mkh0A4Nrjx12Bgz/iceROnSbTsawGk=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, @@ -2167,7 +2173,7 @@ }, "@@rules_apple+//apple:apple.bzl%provisioning_profile_repository_extension": { "general": { - "bzlTransitiveDigest": "NcCruFgaVG8TOGmWY57IFfvqi/kgV8TWUht9jzdbxII=", + "bzlTransitiveDigest": "lgof385rXHmmk4IC53d7qCeKZlZunQ4c6SX3i40TjMI=", "usagesDigest": "vsJl8Rw5NL+5Ag2wdUDoTeRF/5klkXO8545Iy7U1Q08=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, @@ -10730,7 +10736,7 @@ }, "@@rules_rust+//crate_universe/private:internal_extensions.bzl%cu_nr": { "general": { - "bzlTransitiveDigest": "v3W64Jd1Exdm60bqbi8XTxkB3lRAoO4oRqC3mJmnut4=", + "bzlTransitiveDigest": "DvRk1O0kBcPjtC3LTXK2jJwzDK2hy7kpr6ZYVGvCInw=", "usagesDigest": "1ieIYuafZ1pmP+ncVvISMfB3Em0hv9LCmCRwIH7gL8E=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, diff --git a/bazel_common/score_modules_target_sw.MODULE.bazel b/bazel_common/score_modules_target_sw.MODULE.bazel index a4284304d13..1f90f9af655 100644 --- a/bazel_common/score_modules_target_sw.MODULE.bazel +++ b/bazel_common/score_modules_target_sw.MODULE.bazel @@ -43,11 +43,10 @@ git_override( bazel_dep(name = "score_persistency") git_override( module_name = "score_persistency", - commit = "961c0a0989755a1e0fe8de55e83c0a44e2e20b56", + commit = "86ac1e9a176b0ddeeaa3c33c3ac8df65cae594df", patch_strip = 1, patches = [ "//patches/persistency:003-undev-deps-for-root-module.patch", - "//patches/persistency:007-use-score-test-scenarios-paths.patch", ], remote = "https://github.com/eclipse-score/persistency.git", ) @@ -101,6 +100,7 @@ git_override( patches = [ "//patches/config_management:001-adapt-proxy-api-and-remove-internal-targets.patch", "//patches/config_management:002-migrate-baselibs-targets.patch", + "//patches/config_management:003-migrate-kvs-to-full-include-paths.patch", ], remote = "https://github.com/eclipse-score/config_management.git", ) diff --git a/feature_integration_tests/test_scenarios/cpp/BUILD b/feature_integration_tests/test_scenarios/cpp/BUILD index 21a883bca47..68022e7d46b 100644 --- a/feature_integration_tests/test_scenarios/cpp/BUILD +++ b/feature_integration_tests/test_scenarios/cpp/BUILD @@ -25,7 +25,7 @@ cc_binary( deps = [ "@score_baselibs//score/json", "@score_baselibs//score/mw/log:backend_stub_testutil", - "@score_persistency//:kvs_cpp", + "@score_persistency//score/kvs", "@score_test_scenarios//score/test_scenarios_cpp", ], ) diff --git a/feature_integration_tests/test_scenarios/cpp/src/internals/persistency/kvs_build_helpers.h b/feature_integration_tests/test_scenarios/cpp/src/internals/persistency/kvs_build_helpers.h index e0f65444aa8..9ef4c9501cf 100644 --- a/feature_integration_tests/test_scenarios/cpp/src/internals/persistency/kvs_build_helpers.h +++ b/feature_integration_tests/test_scenarios/cpp/src/internals/persistency/kvs_build_helpers.h @@ -16,8 +16,8 @@ #include "kvs_parameters.h" -#include -#include +#include "score/kvs/kvs.hpp" +#include "score/kvs/kvsbuilder.hpp" #include #include @@ -99,27 +99,31 @@ inline std::string format_double_python(double v) { * @param mode Optional KvsDefaults value to convert. * @return Converted boolean flag or nullopt. */ -inline std::optional to_need_flag(const std::optional& mode) { +inline std::optional to_need_flag( + const std::optional& mode) { if (!mode.has_value()) { return std::nullopt; } - return *mode == KvsDefaults::Required; + return *mode == KvsDefaults::Required ? score::mw::per::kvs::OpenNeedDefaults::Required + : score::mw::per::kvs::OpenNeedDefaults::Optional; } /** - * @brief Convert an optional KvsLoad mode to the boolean flag expected by KvsBuilder. + * @brief Convert an optional KvsLoad mode to the enum flag expected by KvsBuilder. * - * Returns true if the mode is Required, false if Optional or Ignored, or + * Returns Required if the mode is Required, Optional if Optional or Ignored, or * std::nullopt if no mode was provided (omit the flag from the builder call). * * @param mode Optional KvsLoad value to convert. - * @return Converted boolean flag or nullopt. + * @return Converted OpenNeedKvs flag or nullopt. */ -inline std::optional to_need_flag(const std::optional& mode) { +inline std::optional to_need_flag( + const std::optional& mode) { if (!mode.has_value()) { return std::nullopt; } - return *mode == KvsLoad::Required; + return *mode == KvsLoad::Required ? score::mw::per::kvs::OpenNeedKvs::Required + : score::mw::per::kvs::OpenNeedKvs::Optional; } /** diff --git a/feature_integration_tests/test_scenarios/cpp/src/internals/persistency/kvs_instance.cpp b/feature_integration_tests/test_scenarios/cpp/src/internals/persistency/kvs_instance.cpp index 703699da627..1bd430d7c7b 100644 --- a/feature_integration_tests/test_scenarios/cpp/src/internals/persistency/kvs_instance.cpp +++ b/feature_integration_tests/test_scenarios/cpp/src/internals/persistency/kvs_instance.cpp @@ -13,7 +13,7 @@ #include "kvs_instance.h" -#include +#include "score/kvs/kvsbuilder.hpp" #include #include @@ -154,26 +154,28 @@ std::optional snapshot_path(const KvsParameters& params) { return dir + "/kvs_" + std::to_string(params.instance_id.value) + "_0.json"; } -std::optional to_need_flag(const std::optional& mode) { +std::optional to_need_flag( + const std::optional& mode) { if (!mode.has_value()) { return std::nullopt; } if (*mode == KvsDefaults::Required) { - return true; + return score::mw::per::kvs::OpenNeedDefaults::Required; } // Optional and Ignored are mapped to not-required for C++ KvsBuilder API. - return false; + return score::mw::per::kvs::OpenNeedDefaults::Optional; } -std::optional to_need_flag(const std::optional& mode) { +std::optional to_need_flag( + const std::optional& mode) { if (!mode.has_value()) { return std::nullopt; } if (*mode == KvsLoad::Required) { - return true; + return score::mw::per::kvs::OpenNeedKvs::Required; } // Optional and Ignored are mapped to not-required for C++ KvsBuilder API. - return false; + return score::mw::per::kvs::OpenNeedKvs::Optional; } } // namespace @@ -186,9 +188,9 @@ std::optional> KvsInstance::create(const KvsParamet try { if (params.snapshot_max_count.has_value() && - params.snapshot_max_count.value() != static_cast(KVS_MAX_SNAPSHOTS)) { + params.snapshot_max_count.value() != static_cast(KVS_MAX_SNAPSHOTS_UPPER_BOUND)) { std::cerr << "Unsupported snapshot_max_count for C++ KVS API: requested " - << params.snapshot_max_count.value() << ", supported " << KVS_MAX_SNAPSHOTS + << params.snapshot_max_count.value() << ", supported " << KVS_MAX_SNAPSHOTS_UPPER_BOUND << std::endl; return std::nullopt; } diff --git a/feature_integration_tests/test_scenarios/cpp/src/internals/persistency/kvs_instance.h b/feature_integration_tests/test_scenarios/cpp/src/internals/persistency/kvs_instance.h index 74654474e6b..a4e15ec6b10 100644 --- a/feature_integration_tests/test_scenarios/cpp/src/internals/persistency/kvs_instance.h +++ b/feature_integration_tests/test_scenarios/cpp/src/internals/persistency/kvs_instance.h @@ -16,7 +16,7 @@ #include "kvs_parameters.h" -#include +#include "score/kvs/kvs.hpp" #include #include #include diff --git a/known_good.json b/known_good.json index 8b409d4cde5..6e59a2dc76f 100644 --- a/known_good.json +++ b/known_good.json @@ -61,8 +61,7 @@ "score_persistency": { "repo": "https://github.com/eclipse-score/persistency.git", "bazel_patches": [ - "//patches/persistency:003-undev-deps-for-root-module.patch", - "//patches/persistency:007-use-score-test-scenarios-paths.patch" + "//patches/persistency:003-undev-deps-for-root-module.patch" ], "metadata": { "code_root_path": "//score/kvs/...", @@ -72,7 +71,6 @@ "@score_logging//score/mw/log/flags:KRemote_Logging=False" ], "exclude_test_targets": [ - "//score/kvs/tests:bm_kvs_cpp", "//score/kvs/tests/integration_test_scenarios/...", "//score/kvs/tests/test_cases/..." ], @@ -84,7 +82,7 @@ "flaky_test_attempts=3" ] }, - "hash": "961c0a0989755a1e0fe8de55e83c0a44e2e20b56" + "hash": "86ac1e9a176b0ddeeaa3c33c3ac8df65cae594df" }, "score_kyron": { "repo": "https://github.com/eclipse-score/kyron.git", @@ -168,7 +166,8 @@ "hash": "e0489b190ed6d2fa183b9a8063e2dba4f6378505", "bazel_patches": [ "//patches/config_management:001-adapt-proxy-api-and-remove-internal-targets.patch", - "//patches/config_management:002-migrate-baselibs-targets.patch" + "//patches/config_management:002-migrate-baselibs-targets.patch", + "//patches/config_management:003-migrate-kvs-to-full-include-paths.patch" ], "metadata": { "code_root_path": "//score/config_management/...", diff --git a/patches/config_management/003-migrate-kvs-to-full-include-paths.patch b/patches/config_management/003-migrate-kvs-to-full-include-paths.patch new file mode 100644 index 00000000000..dccbb72cac5 --- /dev/null +++ b/patches/config_management/003-migrate-kvs-to-full-include-paths.patch @@ -0,0 +1,70 @@ +diff --git a/score/config_management/config_daemon/code/data_model/parameter_set_storage/details/BUILD b/score/config_management/config_daemon/code/data_model/parameter_set_storage/details/BUILD +--- a/score/config_management/config_daemon/code/data_model/parameter_set_storage/details/BUILD ++++ b/score/config_management/config_daemon/code/data_model/parameter_set_storage/details/BUILD +@@ -48,7 +48,7 @@ COMMON_FEATURES = [ + "details_score", + False, + [ +- "@score_persistency//:kvs_cpp", ++ "@score_persistency//score/kvs", + ], + ), + ( +diff --git a/score/config_management/config_daemon/code/data_model/parameter_set_storage/details/parameter_set_storage_score_impl.cpp b/score/config_management/config_daemon/code/data_model/parameter_set_storage/details/parameter_set_storage_score_impl.cpp +--- a/score/config_management/config_daemon/code/data_model/parameter_set_storage/details/parameter_set_storage_score_impl.cpp ++++ b/score/config_management/config_daemon/code/data_model/parameter_set_storage/details/parameter_set_storage_score_impl.cpp +@@ -16,7 +16,7 @@ + #include "score/config_management/config_daemon/code/data_model/parameter_set_storage/error/parameter_set_storage_error.h" + #include "score/config_management/config_daemon/code/data_model/parameterset_collection.h" + +-#include "kvsvalue.hpp" ++#include "score/kvs/kvsvalue.hpp" + #include "score/json/json_writer.h" + #include "score/hash/code/common/algorithms.h" + #include "score/hash/code/core/factory/impl/safe_hash_calculator_factory.h" +diff --git a/score/config_management/config_daemon/code/data_model/parameter_set_storage/details/parameter_set_storage_score_impl.h b/score/config_management/config_daemon/code/data_model/parameter_set_storage/details/parameter_set_storage_score_impl.h +--- a/score/config_management/config_daemon/code/data_model/parameter_set_storage/details/parameter_set_storage_score_impl.h ++++ b/score/config_management/config_daemon/code/data_model/parameter_set_storage/details/parameter_set_storage_score_impl.h +@@ -16,7 +16,7 @@ + + #include "score/config_management/config_daemon/code/data_model/parameter_set_storage/parameter_set_storage.h" + +-#include "kvs.hpp" ++#include "score/kvs/kvs.hpp" + + #include + #include +diff --git a/score/config_management/config_daemon/code/data_model/parameter_set_storage/details/score_kvs_stub/BUILD b/score/config_management/config_daemon/code/data_model/parameter_set_storage/details/score_kvs_stub/BUILD +--- a/score/config_management/config_daemon/code/data_model/parameter_set_storage/details/score_kvs_stub/BUILD ++++ b/score/config_management/config_daemon/code/data_model/parameter_set_storage/details/score_kvs_stub/BUILD +@@ -30,6 +30,7 @@ cc_library( + # Expose the directory itself as a system include path so that + # `#include "kvs.hpp"` resolves here, mirroring how score-persistency does it. + includes = ["."], ++ include_prefix = "score/kvs", + tags = ["FUSA"], + visibility = [ + "//score/config_management/config_daemon/code:__subpackages__", +diff --git a/score/config_management/config_daemon/code/factory/details/factory_mw_impl.cpp b/score/config_management/config_daemon/code/factory/details/factory_mw_impl.cpp +--- a/score/config_management/config_daemon/code/factory/details/factory_mw_impl.cpp ++++ b/score/config_management/config_daemon/code/factory/details/factory_mw_impl.cpp +@@ -18,7 +18,7 @@ + #include "score/config_management/config_daemon/code/fault_event_reporter/details/fault_event_reporter_score_impl.h" + #include "score/config_management/config_daemon/code/json_helper/details/json_helper_impl.h" + +-#include "kvsbuilder.hpp" ++#include "score/kvs/kvsbuilder.hpp" + #include "score/config_management/config_daemon/code/plugins/plugin_collector/details/plugin_collector_impl.h" + #include "score/config_management/config_daemon/code/services/details/internal_config_provider_service_reactor_impl.h" + #include "score/config_management/config_daemon/code/services/details/mw_com/internal_config_provider_service_impl.h" +@@ -101,8 +101,8 @@ std::shared_ptr Factory::CreateParam + std::vector>& plugins) const + { + auto kvs_result = score::mw::per::kvs::KvsBuilder(score::mw::per::kvs::InstanceId{0U}) +- .need_defaults_flag(false) +- .need_kvs_flag(false) ++ .need_defaults_flag(score::mw::per::kvs::OpenNeedDefaults::Optional) ++ .need_kvs_flag(score::mw::per::kvs::OpenNeedKvs::Optional) + .dir("/persistent/trusted/ConfigDaemon") + .build(); + if (!kvs_result.has_value()) diff --git a/patches/persistency/003-undev-deps-for-root-module.patch b/patches/persistency/003-undev-deps-for-root-module.patch index d2d798e4e91..0d7c3a5b7db 100644 --- a/patches/persistency/003-undev-deps-for-root-module.patch +++ b/patches/persistency/003-undev-deps-for-root-module.patch @@ -1,13 +1,12 @@ diff --git a/MODULE.bazel b/MODULE.bazel -index 2649521..6c17327 100644 --- a/MODULE.bazel +++ b/MODULE.bazel -@@ -38,13 +38,13 @@ bazel_dep(name = "score_coverage", version = "0.3.1", dev_dependency = True) +@@ -42,13 +42,13 @@ bazel_dep(name = "score_coverage", version = "0.4.2", dev_dependency = True) + # Development dependencies (alphabetically sorted) bazel_dep(name = "aspect_rules_lint", version = "2.7.2", dev_dependency = True) bazel_dep(name = "buildifier_prebuilt", version = "8.5.1.3", dev_dependency = True) - bazel_dep(name = "google_benchmark", version = "1.9.5", dev_dependency = True) --bazel_dep(name = "googletest", version = "1.17.0.bcr.2", dev_dependency = True) -+bazel_dep(name = "googletest", version = "1.17.0.bcr.2") +-bazel_dep(name = "googletest", version = "1.18.0", dev_dependency = True) ++bazel_dep(name = "googletest", version = "1.18.0") bazel_dep(name = "score_bazel_cpp_toolchains", version = "1.0.3", dev_dependency = True) -bazel_dep(name = "score_sbom", version = "0.1.1", dev_dependency = True) -bazel_dep(name = "score_rules_imagefs", version = "0.1.0", dev_dependency = True) @@ -17,13 +16,13 @@ index 2649521..6c17327 100644 bazel_dep(name = "score_toolchains_rust", version = "0.10.0", dev_dependency = True) -bazel_dep(name = "score_tools", version = "0.0.3", dev_dependency = True) +bazel_dep(name = "score_tools", version = "0.0.3") - + # Pinned past v0.0.3 for the `$(locations)` fix in score_pytest. git_override( -@@ -62,7 +62,7 @@ python.toolchain( +@@ -73,7 +73,7 @@ python.toolchain( python_version = PYTHON_VERSION, ) - + -pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip", dev_dependency = True) +pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip") pip.parse( diff --git a/patches/persistency/007-use-score-test-scenarios-paths.patch b/patches/persistency/007-use-score-test-scenarios-paths.patch deleted file mode 100644 index 0845686f711..00000000000 --- a/patches/persistency/007-use-score-test-scenarios-paths.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/score/kvs/tests/test_scenarios/cpp/BUILD b/score/kvs/tests/test_scenarios/cpp/BUILD ---- a/score/kvs/tests/test_scenarios/cpp/BUILD -+++ b/score/kvs/tests/test_scenarios/cpp/BUILD -@@ -26,7 +26,7 @@ - visibility = ["//visibility:public"], - deps = [ - "//score/kvs:kvs_cpp", - "@score_baselibs//score/mw/log:backend_stub_testutil", -- "@score_test_scenarios//test_scenarios_cpp", -+ "@score_test_scenarios//score/test_scenarios_cpp", - ], - ) -diff --git a/score/kvs/tests/test_scenarios/rust/BUILD b/score/kvs/tests/test_scenarios/rust/BUILD ---- a/score/kvs/tests/test_scenarios/rust/BUILD -+++ b/score/kvs/tests/test_scenarios/rust/BUILD -@@ -30,7 +30,7 @@ - "@score_crates//:tinyjson", - "@score_crates//:tracing", - "@score_crates//:tracing_subscriber", - "@score_logging//score/mw/log/rust/score_log_bridge", -- "@score_test_scenarios//test_scenarios_rust", -+ "@score_test_scenarios//score/test_scenarios_rust", - ], - ) diff --git a/rust_coverage/BUILD b/rust_coverage/BUILD index d307aea482b..70372b61bfe 100644 --- a/rust_coverage/BUILD +++ b/rust_coverage/BUILD @@ -32,7 +32,7 @@ rust_coverage_report( "linux-x86_64", "ferrocene-coverage-per", ], - query = 'kind("rust_test", @score_persistency//score/kvs/...) -@score_persistency//score/kvs/tests:bm_kvs_cpp -@score_persistency//score/kvs/tests/integration_test_scenarios/... -@score_persistency//score/kvs/tests/test_cases/...', + query = 'kind("rust_test", @score_persistency//score/kvs/...) -@score_persistency//score/kvs/tests/integration_test_scenarios/... -@score_persistency//score/kvs/tests/test_cases/...', visibility = ["//visibility:public"], ) From 9c43c4e223cd614633c352140a32653858da6607 Mon Sep 17 00:00:00 2001 From: subramaniak Date: Thu, 22 Oct 2026 08:05:19 +0000 Subject: [PATCH 5/5] chore: bump score_kyron to merged PR#176 commit --- bazel_common/score_modules_target_sw.MODULE.bazel | 2 +- known_good.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bazel_common/score_modules_target_sw.MODULE.bazel b/bazel_common/score_modules_target_sw.MODULE.bazel index 1f90f9af655..2684fef4c56 100644 --- a/bazel_common/score_modules_target_sw.MODULE.bazel +++ b/bazel_common/score_modules_target_sw.MODULE.bazel @@ -54,7 +54,7 @@ git_override( bazel_dep(name = "score_kyron") git_override( module_name = "score_kyron", - commit = "90fb90258f49f17a504d41262634d43608f28ccc", + commit = "52d4bef3d1822f82199d72e58e815b9e43406fe6", remote = "https://github.com/eclipse-score/kyron.git", ) diff --git a/known_good.json b/known_good.json index 6e59a2dc76f..2f9c5ff5f49 100644 --- a/known_good.json +++ b/known_good.json @@ -94,7 +94,7 @@ "rust" ] }, - "hash": "90fb90258f49f17a504d41262634d43608f28ccc" + "hash": "52d4bef3d1822f82199d72e58e815b9e43406fe6" }, "score_lifecycle": { "repo": "https://github.com/eclipse-score/lifecycle.git",