From 5c151a2731b680efa26046e03ed97db8ff2cddf7 Mon Sep 17 00:00:00 2001 From: antonkri <63401640+antonkri@users.noreply.github.com> Date: Fri, 21 Aug 2026 09:59:39 +0000 Subject: [PATCH 1/2] chore(deps): bump score_itf to v0.5.0 Update score_itf commit from bf5294d (v0.3.0) to 802e018 (v0.5.0) in known_good.json and regenerate the derived files via scripts/known_good/update_module_from_known_good.py. The consumed itf API (py_itf_test, plugins=, @score_itf//score/itf/plugins:*) is already on the 0.2+ layout, so no BUILD or Python changes are required. --- bazel_common/score_modules_target_sw.MODULE.bazel | 2 +- bazel_common/score_modules_tooling.MODULE.bazel | 4 ++-- known_good.json | 4 ++-- rust_coverage/BUILD | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bazel_common/score_modules_target_sw.MODULE.bazel b/bazel_common/score_modules_target_sw.MODULE.bazel index 8573ec6b38f..70634a40c99 100644 --- a/bazel_common/score_modules_target_sw.MODULE.bazel +++ b/bazel_common/score_modules_target_sw.MODULE.bazel @@ -11,7 +11,7 @@ # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -# Generated from known_good.json at 2026-07-31T00:00:00+00:00Z +# Generated from known_good.json at 2026-08-21T00:00:00+00:00Z # Do not edit manually - use scripts/known_good/update_module_from_known_good.py bazel_dep(name = "score_baselibs") diff --git a/bazel_common/score_modules_tooling.MODULE.bazel b/bazel_common/score_modules_tooling.MODULE.bazel index 5a3141ef8c5..643c3a62376 100644 --- a/bazel_common/score_modules_tooling.MODULE.bazel +++ b/bazel_common/score_modules_tooling.MODULE.bazel @@ -11,7 +11,7 @@ # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -# Generated from known_good.json at 2026-07-31T00:00:00+00:00Z +# Generated from known_good.json at 2026-08-21T00:00:00+00:00Z # Do not edit manually - use scripts/known_good/update_module_from_known_good.py bazel_dep(name = "score_crates") @@ -24,7 +24,7 @@ git_override( bazel_dep(name = "score_itf") git_override( module_name = "score_itf", - commit = "bf5294d7618e361c224edbd754060cee810285eb", + commit = "802e0186d373e0d9d67c1c9ccb1ea08952c7ad06", remote = "https://github.com/eclipse-score/itf.git", ) diff --git a/known_good.json b/known_good.json index bfc14d87ec4..9389a21a057 100644 --- a/known_good.json +++ b/known_good.json @@ -169,7 +169,7 @@ }, "score_itf": { "repo": "https://github.com/eclipse-score/itf.git", - "hash": "bf5294d7618e361c224edbd754060cee810285eb" + "hash": "802e0186d373e0d9d67c1c9ccb1ea08952c7ad06" }, "score_tooling": { "repo": "https://github.com/eclipse-score/tooling.git", @@ -197,5 +197,5 @@ } } }, - "timestamp": "2026-07-31T00:00:00+00:00Z" + "timestamp": "2026-08-21T00:00:00+00:00Z" } diff --git a/rust_coverage/BUILD b/rust_coverage/BUILD index 74e3d374600..3cdb06861b8 100644 --- a/rust_coverage/BUILD +++ b/rust_coverage/BUILD @@ -11,7 +11,7 @@ # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************* -# Generated from known_good.json at 2026-07-31T00:00:00+00:00Z +# Generated from known_good.json at 2026-08-21T00:00:00+00:00Z # Do not edit manually - use scripts/known_good/update_module_from_known_good.py load("@score_tooling//:defs.bzl", "rust_coverage_report") From 14efeb0b1db0d92605dd597d5e4a5f077dccccd7 Mon Sep 17 00:00:00 2001 From: antonkri <63401640+antonkri@users.noreply.github.com> Date: Fri, 21 Aug 2026 11:59:43 +0000 Subject: [PATCH 2/2] feature_integration_tests/itf: pin dlt_config to container gateway score_itf 0.5.0 (commit bb3a788 "docker: Create per-container bridge network") makes the Docker plugin create a dedicated bridge network score_itf_ per container instead of joining the default docker0 bridge. As a consequence the hardcoded 172.17.0.1 host_ip/target_ip in feature_integration_tests/configs/dlt_config_x86_64.json no longer matches the container's actual gateway, so DLT UDP multicast (239.255. 42.99) is never delivered to the host-side dlt-receive and the two DLT tests fail with 'DLT TRACE FILE IS EMPTY'. Add a local conftest.py that overrides the session-scoped dlt_config fixture and pins host_ip/target_ip to target.get_gateway() when the target exposes it (Docker). QEMU targets (QNX) do not expose get_gateway; the static IPs from dlt_config_qnx_x86_64.json continue to be used unchanged there. Wire the new conftest.py into the py_itf_test data so it is present in the Bazel test sandbox next to the test sources. Refs: eclipse-score/reference_integration#307 --- feature_integration_tests/itf/BUILD | 2 +- feature_integration_tests/itf/conftest.py | 42 +++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 feature_integration_tests/itf/conftest.py diff --git a/feature_integration_tests/itf/BUILD b/feature_integration_tests/itf/BUILD index c1834ddc4b9..35dc1d33e6c 100644 --- a/feature_integration_tests/itf/BUILD +++ b/feature_integration_tests/itf/BUILD @@ -69,7 +69,7 @@ py_itf_test( "//feature_integration_tests/configs:qemu_bridge_config.json", "//images/qnx_x86_64:image", ], - }), + }) + ["conftest.py"], plugins = select( { ":config_linux_x86_64": [ diff --git a/feature_integration_tests/itf/conftest.py b/feature_integration_tests/itf/conftest.py new file mode 100644 index 00000000000..9c60f9b0617 --- /dev/null +++ b/feature_integration_tests/itf/conftest.py @@ -0,0 +1,42 @@ +# ******************************************************************************* +# Copyright (c) 2026 Contributors to the Eclipse Foundation +# +# See the NOTICE file(s) distributed with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made available under the +# terms of the Apache License Version 2.0 which is available at +# https://www.apache.org/licenses/LICENSE-2.0 +# +# SPDX-License-Identifier: Apache-2.0 +# ******************************************************************************* + +import copy + +import pytest + + +@pytest.fixture +def dlt_config(dlt_config, target): + """Override the session-scoped dlt_config so host_ip/target_ip track the + Docker target's actual per-container bridge. + + Since score_itf 0.5.0 (commit bb3a788, "docker: Create per-container bridge + network") the Docker plugin no longer places the container on the default + ``bridge`` network. It creates a dedicated ``score_itf_`` bridge with + its own subnet, so the ``172.17.0.1`` value hardcoded in + ``configs/dlt_config_x86_64.json`` no longer matches the container's real + gateway and DLT UDP multicast never reaches the host-side ``dlt-receive``. + + On QEMU targets (QNX) ``get_gateway`` is not available; the static IPs from + the JSON config are still correct there and we return the session-scoped + value unchanged. + """ + if not hasattr(target, "get_gateway"): + return dlt_config + + gateway = target.get_gateway() + cfg = copy.copy(dlt_config) + cfg.host_ip = gateway + cfg.target_ip = gateway + return cfg