Skip to content

Commit 139b254

Browse files
kgraeperrmaddikery
kgraeper
authored and
rmaddikery
committed
update known_good to latest mains (eclipse-score#78)
1 parent ff55c9e commit 139b254

14 files changed

Lines changed: 162 additions & 103 deletions

File tree

‎MODULE.bazel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ include("//:score_modules.MODULE.bazel")
2121
include("//:score_toolchains.MODULE.bazel")
2222

2323
## Python
24-
bazel_dep(name = "rules_python", version = "1.4.1")
24+
bazel_dep(name = "rules_python", version = "1.5.1")
2525

2626
PYTHON_VERSION = "3.12"
2727

@@ -62,6 +62,6 @@ git_override(
6262
)
6363

6464
# imports for the feature showcase module
65-
bazel_dep(name = "rules_rust", version = "0.61.0")
65+
bazel_dep(name = "rules_rust", version = "0.67.0")
6666
bazel_dep(name = "score_itf", version = "0.1.0")
67-
bazel_dep(name = "score_crates", version = "0.0.4")
67+
bazel_dep(name = "score_crates", version = "0.0.6")

‎feature_integration_tests/test_cases/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ score_py_pytest(
4040
env = {
4141
"RUST_BACKTRACE": "1",
4242
},
43-
pytest_ini = ":pytest.ini",
43+
pytest_config = ":pytest.ini",
4444
deps = all_requirements,
4545
)

‎feature_integration_tests/test_scenarios/rust/src/internals/persistency/kvs_instance.rs‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
//! KVS instance test helpers.
22
33
use crate::internals::persistency::kvs_parameters::KvsParameters;
4+
use rust_kvs::json_backend::JsonBackendBuilder;
45
use rust_kvs::prelude::{ErrorCode, Kvs, KvsBuilder};
56

67
/// Create KVS instance based on provided parameters.
@@ -16,11 +17,21 @@ pub fn kvs_instance(kvs_parameters: KvsParameters) -> Result<Kvs, ErrorCode> {
1617
}
1718

1819
if let Some(dir) = kvs_parameters.dir {
19-
builder = builder.dir(dir.to_string_lossy().to_string());
20-
}
21-
22-
if let Some(snapshot_max_count) = kvs_parameters.snapshot_max_count {
23-
builder = builder.snapshot_max_count(snapshot_max_count);
20+
// Use JsonBackendBuilder to configure directory and snapshot_max_count
21+
// (these methods not available directly on KvsBuilder in Rust)
22+
// change back to dir, if https://github.com/eclipse-score/persistency/issues/222 is resolved.
23+
let backend = JsonBackendBuilder::new()
24+
.working_dir(dir)
25+
.snapshot_max_count(kvs_parameters.snapshot_max_count.unwrap_or(1))
26+
.build();
27+
builder = builder.backend(Box::new(backend));
28+
} else if let Some(snapshot_max_count) = kvs_parameters.snapshot_max_count {
29+
// Configure snapshot_max_count via backend
30+
// change back to snapshot_max_count, if https://github.com/eclipse-score/persistency/issues/222 is resolved.
31+
let backend = JsonBackendBuilder::new()
32+
.snapshot_max_count(snapshot_max_count)
33+
.build();
34+
builder = builder.backend(Box::new(backend));
2435
}
2536

2637
let kvs: Kvs = builder.build()?;

‎feature_integration_tests/test_scenarios/rust/src/scenarios/basic/orchestration_with_persistency.rs‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ use orchestration::{
1919
common::DesignConfig,
2020
};
2121

22+
use rust_kvs::json_backend::JsonBackendBuilder;
2223
use rust_kvs::kvs_api::KvsApi;
23-
use rust_kvs::Kvs;
24-
use rust_kvs::KvsBuilder;
24+
use rust_kvs::prelude::{Kvs, KvsBuilder};
2525
use serde_json::Value;
2626

2727
use test_scenarios_rust::scenario::Scenario;
@@ -76,10 +76,19 @@ async fn kvs_save_cycle_number(path: String) -> Result<(), UserErrValue> {
7676
builder = builder.kvs_load(flag);
7777
}
7878
if let Some(dir) = params.dir {
79-
builder = builder.dir(dir.to_string_lossy().to_string());
80-
}
81-
if let Some(max_count) = params.snapshot_max_count {
82-
builder = builder.snapshot_max_count(max_count);
79+
// Use JsonBackendBuilder to configure directory (dir() method not available in Rust KvsBuilder)
80+
// change back to dir, if https://github.com/eclipse-score/persistency/issues/222 is resolved.
81+
let backend = JsonBackendBuilder::new()
82+
.working_dir(dir)
83+
.snapshot_max_count(params.snapshot_max_count.unwrap_or(1))
84+
.build();
85+
builder = builder.backend(Box::new(backend));
86+
} else if let Some(max_count) = params.snapshot_max_count {
87+
// Configure snapshot_max_count via backend even without custom dir
88+
let backend = JsonBackendBuilder::new()
89+
.snapshot_max_count(max_count)
90+
.build();
91+
builder = builder.backend(Box::new(backend));
8392
}
8493

8594
// Create KVS.

‎feature_showcase/rust/orchestration_persistency/main.rs‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
// SPDX-License-Identifier: Apache-2.0
1212
//
1313

14+
use std::path::PathBuf;
1415
use std::time::Duration;
1516

1617
use kyron::runtime::*;
@@ -25,6 +26,7 @@ use orchestration::{
2526
prelude::InvokeResult,
2627
};
2728

29+
use rust_kvs::json_backend::JsonBackendBuilder;
2830
use rust_kvs::prelude::*;
2931

3032
// Example Summary:
@@ -56,8 +58,15 @@ async fn on_shutdown() -> InvokeResult {
5658

5759
// Instance ID for KVS object instances.
5860
let instance_id = InstanceId(0);
61+
62+
// Configure backend with directory path (workaround: KvsBuilder::dir() not available in Rust)
63+
// change back to dir, if https://github.com/eclipse-score/persistency/issues/222 is resolved.
64+
let backend = JsonBackendBuilder::new()
65+
.working_dir(PathBuf::from("./"))
66+
.build();
67+
5968
let builder = KvsBuilder::new(instance_id)
60-
.dir("./")
69+
.backend(Box::new(backend))
6170
.kvs_load(KvsLoad::Optional);
6271
let kvs = builder.build().unwrap();
6372

‎known_good.json‎

Lines changed: 23 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,58 @@
11
{
2-
"timestamp": "2025-08-13T12:55:10Z",
32
"modules": {
43
"score_baselibs": {
5-
"version": "0.2.2",
6-
"hash": "a3557b809406289a3bf0bc6c447a1d646ee67ba0",
74
"repo": "https://github.com/eclipse-score/baselibs.git",
8-
"branch": "release_v0_2_2"
5+
"hash": "ccfe7dc563bedc77fe6e19bd7050104e80fdf7e1"
96
},
107
"score_communication": {
11-
"version": "0.1.2",
128
"repo": "https://github.com/eclipse-score/communication.git",
13-
"hash": "d5414f75bfd4fc116572091ccca305d9e4b39338"
9+
"hash": "1d3e115e953de771cfb6c780cf677cf3fe5e8bee"
1410
},
1511
"score_logging": {
16-
"version": "0.0.4",
17-
"hash": "d3624d52151fcde9c8351867353a8baf59a269cd",
1812
"repo": "https://github.com/eclipse-score/logging.git",
19-
"branch": "score_05_beta"
13+
"hash": "cddfb10832cf384ee5c3f8553fb898f56c1d1def"
2014
},
2115
"score_persistency": {
22-
"version": "0.2.2",
23-
"hash": "9101956287a94d37ac34c29e94fa6f8d96879a73",
24-
"repo": "https://github.com/eclipse-score/persistency.git"
16+
"repo": "https://github.com/eclipse-score/persistency.git",
17+
"hash": "652f78a822dac698dcb60f80adbc3aea488ebee5"
2518
},
2619
"score_orchestrator": {
27-
"version": "0.0.4",
28-
"hash": "92ee5ff22e571f2180a44edddcb81474e1ec68db",
29-
"repo": "https://github.com/eclipse-score/orchestrator.git"
20+
"repo": "https://github.com/eclipse-score/orchestrator.git",
21+
"hash": "dcf5518ac78d01cc06ed8a7ffe9e476c2fa43bd6"
3022
},
3123
"score_kyron": {
32-
"version": "0.0.3",
33-
"hash": "558c5b5d8cd142baeafbfce15185c03b97e08eeb",
34-
"repo": "https://github.com/eclipse-score/kyron.git"
24+
"repo": "https://github.com/eclipse-score/kyron.git",
25+
"hash": "ed312bdc6a50abc73f97b8c7e2ad4726fed06e81"
3526
},
3627
"score_feo": {
37-
"version": "1.0.2",
38-
"hash": "4841281ab81aad114cfc86a19a69c029a274f28d",
3928
"repo": "https://github.com/eclipse-score/feo.git",
29+
"hash": "4841281ab81aad114cfc86a19a69c029a274f28d",
4030
"branch": "candidate_v0.5"
4131
},
4232
"score_tooling": {
43-
"version": "1.0.4",
44-
"hash": "905d1feb00f4ffb586d781f6420423855f802a4c",
45-
"repo": "https://github.com/eclipse-score/tooling.git"
33+
"repo": "https://github.com/eclipse-score/tooling.git",
34+
"hash": "092d229dbc671febe87ddce5c9763b1f62e2dbaf"
4635
},
4736
"score_platform": {
48-
"version": "0.5.2",
49-
"hash": "754ef0ddf4cbc68667c1e54c3212a58ecda7837e",
50-
"repo": "https://github.com/eclipse-score/score.git"
37+
"repo": "https://github.com/eclipse-score/score.git",
38+
"hash": "dafe356f60f725ff77941c220200e1df28965d2d"
5139
},
5240
"score_bazel_platforms": {
53-
"version": "0.0.3",
54-
"hash": "c4813d5b65be9cec1d3a2b4d56cce2cf334fad27",
55-
"repo": "https://github.com/eclipse-score/bazel_platforms.git"
41+
"repo": "https://github.com/eclipse-score/bazel_platforms.git",
42+
"hash": "2286de89c35d5660ad183906a6f010b33fcac8db"
5643
},
5744
"score_test_scenarios": {
58-
"version": "0.3.1",
59-
"hash": "55280e1376922aead6e09f32542f4e2d0b90cc51",
60-
"repo": "https://github.com/eclipse-score/testing_tools.git"
45+
"repo": "https://github.com/eclipse-score/testing_tools.git",
46+
"hash": "6b5e85863e8fb5687251c19f5bb81e0a3afdf581"
6147
},
6248
"score_docs_as_code": {
63-
"version": "2.2.0",
64-
"hash": "c87cd898ef63ce15daec434dc5ea161651cefe97",
65-
"repo": "https://github.com/eclipse-score/docs-as-code.git"
49+
"repo": "https://github.com/eclipse-score/docs-as-code.git",
50+
"hash": "d9f95fd2fdf2df494a8d499b5f061a84f320b53b"
6651
},
6752
"score_process": {
68-
"version": "1.4.0",
69-
"hash": "d0570797b22649be2d2cdb603f2d70bdbff304ed",
70-
"repo": "https://github.com/eclipse-score/process_description.git"
53+
"repo": "https://github.com/eclipse-score/process_description.git",
54+
"hash": "86f77b5514e32694efed3541558041b653830380"
7155
}
7256
},
73-
"manifest_sha256": "4c9b7f...",
74-
"suite": "full",
75-
"duration_s": 742
57+
"timestamp": "2026-01-21T08:46:20+00:00Z"
7658
}

‎score_modules.MODULE.bazel‎

Lines changed: 41 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,83 +11,96 @@
1111
# SPDX-License-Identifier: Apache-2.0
1212
# *******************************************************************************
1313

14-
# Generated from known_good.json at 2025-08-13T12:55:10Z
15-
# Do not edit manually - use tools/update_module_from_known_good.py
14+
# Generated from known_good.json at 2026-01-21T08:46:20+00:00Z
15+
# Do not edit manually - use scripts/known_good/update_module_from_known_good.py
1616

1717
bazel_dep(name = "score_baselibs")
18-
single_version_override(
18+
git_override(
1919
module_name = "score_baselibs",
20-
version = "0.2.2",
20+
remote = "https://github.com/eclipse-score/baselibs.git",
21+
commit = "ccfe7dc563bedc77fe6e19bd7050104e80fdf7e1",
2122
)
2223

2324
bazel_dep(name = "score_communication")
24-
single_version_override(
25+
git_override(
2526
module_name = "score_communication",
26-
version = "0.1.2",
27+
remote = "https://github.com/eclipse-score/communication.git",
28+
commit = "1d3e115e953de771cfb6c780cf677cf3fe5e8bee",
2729
)
2830

2931
bazel_dep(name = "score_logging")
30-
single_version_override(
32+
git_override(
3133
module_name = "score_logging",
32-
version = "0.0.4",
34+
remote = "https://github.com/eclipse-score/logging.git",
35+
commit = "cddfb10832cf384ee5c3f8553fb898f56c1d1def",
3336
)
3437

3538
bazel_dep(name = "score_persistency")
36-
single_version_override(
39+
git_override(
3740
module_name = "score_persistency",
38-
version = "0.2.2",
41+
remote = "https://github.com/eclipse-score/persistency.git",
42+
commit = "652f78a822dac698dcb60f80adbc3aea488ebee5",
3943
)
4044

4145
bazel_dep(name = "score_orchestrator")
42-
single_version_override(
46+
git_override(
4347
module_name = "score_orchestrator",
44-
version = "0.0.4",
48+
remote = "https://github.com/eclipse-score/orchestrator.git",
49+
commit = "dcf5518ac78d01cc06ed8a7ffe9e476c2fa43bd6",
4550
)
4651

4752
bazel_dep(name = "score_kyron")
48-
single_version_override(
53+
git_override(
4954
module_name = "score_kyron",
50-
version = "0.0.3",
55+
remote = "https://github.com/eclipse-score/kyron.git",
56+
commit = "ed312bdc6a50abc73f97b8c7e2ad4726fed06e81",
5157
)
5258

5359
bazel_dep(name = "score_feo")
54-
single_version_override(
60+
git_override(
5561
module_name = "score_feo",
56-
version = "1.0.2",
62+
remote = "https://github.com/eclipse-score/feo.git",
63+
commit = "4841281ab81aad114cfc86a19a69c029a274f28d",
5764
)
5865

5966
bazel_dep(name = "score_tooling")
60-
single_version_override(
67+
git_override(
6168
module_name = "score_tooling",
62-
version = "1.0.4",
69+
remote = "https://github.com/eclipse-score/tooling.git",
70+
commit = "092d229dbc671febe87ddce5c9763b1f62e2dbaf",
6371
)
6472

6573
bazel_dep(name = "score_platform")
66-
single_version_override(
74+
git_override(
6775
module_name = "score_platform",
68-
version = "0.5.2",
76+
remote = "https://github.com/eclipse-score/score.git",
77+
commit = "dafe356f60f725ff77941c220200e1df28965d2d",
6978
)
7079

7180
bazel_dep(name = "score_bazel_platforms")
72-
single_version_override(
81+
git_override(
7382
module_name = "score_bazel_platforms",
74-
version = "0.0.3",
83+
remote = "https://github.com/eclipse-score/bazel_platforms.git",
84+
commit = "2286de89c35d5660ad183906a6f010b33fcac8db",
7585
)
7686

7787
bazel_dep(name = "score_test_scenarios")
78-
single_version_override(
88+
git_override(
7989
module_name = "score_test_scenarios",
80-
version = "0.3.1",
90+
remote = "https://github.com/eclipse-score/testing_tools.git",
91+
commit = "6b5e85863e8fb5687251c19f5bb81e0a3afdf581",
8192
)
8293

8394
bazel_dep(name = "score_docs_as_code")
84-
single_version_override(
95+
git_override(
8596
module_name = "score_docs_as_code",
86-
version = "2.2.0",
97+
remote = "https://github.com/eclipse-score/docs-as-code.git",
98+
commit = "d9f95fd2fdf2df494a8d499b5f061a84f320b53b",
8799
)
88100

89101
bazel_dep(name = "score_process")
90-
single_version_override(
102+
git_override(
91103
module_name = "score_process",
92-
version = "1.4.0",
104+
remote = "https://github.com/eclipse-score/process_description.git",
105+
commit = "86f77b5514e32694efed3541558041b653830380",
93106
)

‎scripts/integration_test.py‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,10 @@ def build_group(group_name: str, targets: str, config: str, log_file: Path) -> T
160160

161161
# Run build and capture output
162162
with open(log_file, 'w') as f:
163+
# Write command to log file
164+
f.write(f"Command: {' '.join(cmd)}\n")
165+
f.write("-" * 80 + "\n\n")
166+
163167
process = subprocess.Popen(
164168
cmd,
165169
stdout=subprocess.PIPE,
@@ -288,8 +292,15 @@ def main():
288292
summary_file.parent.mkdir(parents=True, exist_ok=True)
289293

290294
# Load modules from known_good files
291-
old_modules = load_known_good(Path('known_good.json')).modules if Path('known_good.json').exists() else {}
292-
new_modules = load_known_good(known_good_file).modules if known_good_file else {}
295+
try:
296+
old_modules = load_known_good(Path('known_good.json')).modules if Path('known_good.json').exists() else {}
297+
except FileNotFoundError:
298+
old_modules = {}
299+
300+
try:
301+
new_modules = load_known_good(known_good_file).modules if known_good_file else {}
302+
except FileNotFoundError as e:
303+
raise SystemExit(f"ERROR: {e}")
293304

294305
# Start summary
295306
timestamp = datetime.now().strftime('%Y-%m-%d %H:%M:%S')

‎scripts/known_good/known_good_to_workspace_metadata.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,13 @@ def main():
2222
args = parser.parse_args()
2323

2424
# Load known_good using KnownGood dataclass
25-
known_good = load_known_good(Path(args.known_good))
25+
try:
26+
known_good = load_known_good(Path(args.known_good))
27+
except FileNotFoundError as e:
28+
raise SystemExit(f"ERROR: {e}")
29+
except ValueError as e:
30+
raise SystemExit(f"ERROR: {e}")
31+
2632
modules = list(known_good.modules.values())
2733

2834
gita_metadata = []

0 commit comments

Comments
 (0)