Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
common --registry=https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/
common --registry=https://bcr.bazel.build
common --credential_helper=*.qnx.com=%workspace%/scripts/qnx_credential_helper.py
common --credential_helper=*.qnx.com=%workspace%/.github/tools/qnx_credential_helper.py
common --credential_helper_timeout="60s"

# Java
Expand All @@ -13,7 +13,6 @@ build --tool_java_language_version=17
build --java_runtime_version=remotejdk_17
build --tool_java_runtime_version=remotejdk_17

build:_common --@score_baselibs//score/mw/log/detail/flags:KUse_Stub_Implementation_Only=False
build:_common --@score_baselibs//score/mw/log/flags:KRemote_Logging=False
build:_common --@score_baselibs//score/json:base_library=nlohmann
build:_common --@score_baselibs//score/memory/shared/flags:use_typedshmd=False
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_and_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -209,4 +209,4 @@ jobs:
uses: eclipse-score/cicd-workflows/.github/actions/deploy-versioned-pages@main
with:
source_folder: extracted_docs/_build
deployment_type: ${{ inputs.deployment_type }}
deployment_type: workflow
34 changes: 19 additions & 15 deletions bazel_common/score_modules_target_sw.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,12 @@
# Do not edit manually - use scripts/known_good/update_module_from_known_good.py

bazel_dep(name = "score_baselibs")
single_version_override(
git_override(
module_name = "score_baselibs",
version = "0.1.3",
remote = "https://github.com/eclipse-score/baselibs.git",
commit = "158fe6a7b791c58f6eac5f7e4662b8db0cf9ac6e",
patches = [
"//patches/baselibs:003-acl-fixes-for-aarch64.patch",
"//patches/baselibs:0001-RH-exception-header.patch",
"//patches/baselibs:0002-RH-algorithm-header.patch",
],
patch_strip = 1,
)
Expand All @@ -30,46 +29,51 @@ bazel_dep(name = "score_baselibs_rust")
git_override(
module_name = "score_baselibs_rust",
remote = "https://github.com/eclipse-score/baselibs_rust.git",
commit = "0eba2934fa8b0e1a343ec6bf6f7ff00cec27d81c",
commit = "9f781acfb6d1a8fa06012ce772b0befb304acf31",
)

bazel_dep(name = "score_communication")
single_version_override(
git_override(
module_name = "score_communication",
version = "0.1.1",
remote = "https://github.com/eclipse-score/communication.git",
commit = "56448a5589a5f7d3921b873e8127b824a8c1ca95",
patches = [
"//patches/communication:001-expose-comm-examples.patch",
],
patch_strip = 1,
)

bazel_dep(name = "score_persistency")
git_override(
module_name = "score_persistency",
remote = "https://github.com/eclipse-score/persistency.git",
commit = "0037034bf853e5f955f028fab54ed319fb0441c3",
commit = "dcefb5bb3399d79ac21e8f304d67019712aff5de",
)

bazel_dep(name = "score_orchestrator")
git_override(
module_name = "score_orchestrator",
remote = "https://github.com/eclipse-score/orchestrator.git",
commit = "18e136c34750c5db707f27f917d52efc7541e087",
commit = "675007a2baa226fad1e2979ed732360dc111d056",
)

bazel_dep(name = "score_kyron")
git_override(
module_name = "score_kyron",
remote = "https://github.com/eclipse-score/kyron.git",
commit = "ed312bdc6a50abc73f97b8c7e2ad4726fed06e81",
commit = "d4d0afc1dd733a0c8a4aba9cc2b2b3a58d38ebf6",
)

bazel_dep(name = "score_lifecycle_health")
git_override(
module_name = "score_lifecycle_health",
remote = "https://github.com/eclipse-score/lifecycle.git",
commit = "84303c2e48c7e8e2481752170efe82d0afd45f1e",
commit = "14ee704eeac03e03ca10bece5de8b694d3c5e2dd",
)

bazel_dep(name = "score_scrample")
bazel_dep(name = "score_logging")
git_override(
module_name = "score_scrample",
remote = "https://github.com/eclipse-score/scrample.git",
commit = "0c2e72fc2a72a7dce4d9ddeec8470a861b08d5e1",
module_name = "score_logging",
remote = "https://github.com/qorix-group/logging.git",
commit = "3718923aafc273531b1d0b3a240d821db24afbbc",
)
1 change: 0 additions & 1 deletion images/autosd_x86_64/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ rpm_package(
"//showcases/cli:cli",
"//showcases/kyron:kyron_example",
"//showcases/orchestration_persistency:orch_per_example",
"@score_scrample//src:scrample"
],
config_dir = "/etc/score",
data = [
Expand Down
12 changes: 6 additions & 6 deletions images/ebclfsa_aarch64/scrample_integration/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@
# *******************************************************************************
load("@score_baselibs//score/language/safecpp:toolchain_features.bzl", "COMPILER_WARNING_FEATURES")

# TODO: Port image to CLI and all showcases as for other images
genrule(
name = "scrample_sil_r",
srcs = ["@score_scrample//src:scrample"],
srcs = ["@score_communication//score/mw/com/example/ipc_bridge:ipc_bridge_cpp"],
outs = ["scrample_sil"],
cmd = "cp $(SRCS) $@ && \
chmod ugo+w $@ && \
Expand Down Expand Up @@ -44,7 +45,6 @@ cc_binary(
],
features = COMPILER_WARNING_FEATURES,
deps = [
"@score_scrample//src:scrample",
],
)

Expand All @@ -68,11 +68,11 @@ genrule(
genrule(
name = "upload",
srcs = [
"@score_scrample//src:scrample",
"@score_communication//score/mw/com/example/ipc_bridge:ipc_bridge_cpp",
":scrample_sil",
":hi_app",
":fastdev-image",
"etc/mw_com_config.json",
"@score_communication//score/mw/com/example/ipc_bridge:etc/mw_com_config.json",
"etc/logging.json",
"run_qemu.sh",
],
Expand All @@ -82,9 +82,9 @@ genrule(
$(location run_qemu.sh) $(RULEDIR)/ebcl-qemuarm64-modified -pidfile $(RULEDIR)/qemu.pid > $(RULEDIR)/qemu_upload.log &\
sleep 30 ; \
sshpass -p linux scp -o StrictHostKeyChecking=no -P 2222 $(location :scrample_sil) root@localhost:/usr/bin &&\
sshpass -p linux scp -o StrictHostKeyChecking=no -P 2222 $(location @score_scrample//src:scrample) root@localhost:/usr/bin &&\
sshpass -p linux scp -o StrictHostKeyChecking=no -P 2222 $(location @score_communication//score/mw/com/example/ipc_bridge:ipc_bridge_cpp) root@localhost:/usr/bin &&\
sshpass -p linux scp -o StrictHostKeyChecking=no -P 2222 $(location :hi_app) root@localhost:/usr/bin &&\
sshpass -p linux scp -o StrictHostKeyChecking=no -P 2222 $(location etc/mw_com_config.json) root@localhost:/etc/ &&\
sshpass -p linux scp -o StrictHostKeyChecking=no -P 2222 $(location @score_communication//score/mw/com/example/ipc_bridge:etc/mw_com_config.json) root@localhost:/etc/ &&\
sshpass -p linux scp -o StrictHostKeyChecking=no -P 2222 $(location etc/logging.json) root@localhost:/etc/ &&\
sshpass -p linux ssh -o StrictHostKeyChecking=no -p 2222 root@localhost sync &&\
sshpass -p linux ssh -o StrictHostKeyChecking=no -p 2222 root@localhost crinit-ctl poweroff || true \
Expand Down
63 changes: 0 additions & 63 deletions images/ebclfsa_aarch64/scrample_integration/etc/mw_com_config.json

This file was deleted.

4 changes: 2 additions & 2 deletions images/ebclfsa_aarch64/scrample_integration/src/main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ int main() {
std::cout << "HI_App: Starting scrample_sil" << std::endl;

const char *c_args[] = {
"/usr/bin/scrample_sil",
"/usr/bin/ipc_bridge_cpp",
"-n", "10",
"-m", "recv",
"-t", "200",
"-s", "/etc/mw_com_config.json",
nullptr
};

execve("/usr/bin/scrample_sil", const_cast<char* const*>(c_args), nullptr);
execve("/usr/bin/ipc_bridge_cpp", const_cast<char* const*>(c_args), nullptr);

std::cerr << "execve failed, sleeping... Reason: " << strerror(errno)
<< std::endl;
Expand Down
48 changes: 31 additions & 17 deletions known_good.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@
"target_sw": {
"score_baselibs": {
"repo": "https://github.com/eclipse-score/baselibs.git",
"hash": "ffd1c812213c66a436ed982632f6942528b58be8",
"version": "0.1.3",
"hash": "158fe6a7b791c58f6eac5f7e4662b8db0cf9ac6e",
"bazel_patches": [
"//patches/baselibs:003-acl-fixes-for-aarch64.patch",
"//patches/baselibs:0001-RH-exception-header.patch",
"//patches/baselibs:0002-RH-algorithm-header.patch"
"//patches/baselibs:003-acl-fixes-for-aarch64.patch"
],
"metadata": {
"exclude_test_targets": [
Expand All @@ -22,16 +19,18 @@
},
"score_baselibs_rust": {
"repo": "https://github.com/eclipse-score/baselibs_rust.git",
"hash": "0eba2934fa8b0e1a343ec6bf6f7ff00cec27d81c",
"hash": "9f781acfb6d1a8fa06012ce772b0befb304acf31",
"metadata": {
"code_root_path": "//src/...",
"langs": ["rust"]
}
},
"score_communication": {
"repo": "https://github.com/eclipse-score/communication.git",
"hash": "0c0ea032995eaa766f5bdcec031bc02ee10d4587",
"version": "0.1.1",
"hash": "56448a5589a5f7d3921b873e8127b824a8c1ca95",
"bazel_patches": [
"//patches/communication:001-expose-comm-examples.patch"
],
"metadata": {
"exclude_test_targets": [
"//score/*"
Expand All @@ -40,7 +39,7 @@
},
"score_persistency": {
"repo": "https://github.com/eclipse-score/persistency.git",
"hash": "0037034bf853e5f955f028fab54ed319fb0441c3",
"hash": "9692dadab51c677183262e8870c5425ab1797c4f",
"metadata": {
"code_root_path": "//src/...",
"exclude_test_targets": [
Expand All @@ -50,30 +49,47 @@
},
"score_orchestrator": {
"repo": "https://github.com/eclipse-score/orchestrator.git",
"hash": "18e136c34750c5db707f27f917d52efc7541e087",
"hash": "675007a2baa226fad1e2979ed732360dc111d056",
"metadata": {
"code_root_path": "//src/...",
"langs": ["rust"]
}
},
"score_kyron": {
"repo": "https://github.com/eclipse-score/kyron.git",
"hash": "ed312bdc6a50abc73f97b8c7e2ad4726fed06e81",
"hash": "d4d0afc1dd733a0c8a4aba9cc2b2b3a58d38ebf6",
"metadata": {
"code_root_path": "//src/...",
"langs": ["rust"]
}
},
"score_lifecycle_health": {
"repo": "https://github.com/eclipse-score/lifecycle.git",
"hash": "84303c2e48c7e8e2481752170efe82d0afd45f1e",
"hash": "14ee704eeac03e03ca10bece5de8b694d3c5e2dd",
"metadata": {
"code_root_path": "//src/..."
}
},
"score_scrample": {
"repo": "https://github.com/eclipse-score/scrample.git",
"hash": "0c2e72fc2a72a7dce4d9ddeec8470a861b08d5e1"
"score_logging": {
"repo": "https://github.com/qorix-group/logging.git",
"hash": "3718923aafc273531b1d0b3a240d821db24afbbc",
"metadata": {
"extra_test_config": [
"//score/datarouter/build_configuration_flags:persistent_logging=False",
"//score/datarouter/build_configuration_flags:persistent_config_feature_enabled=False",
"//score/datarouter/build_configuration_flags:enable_nonverbose_dlt=False",
"//score/datarouter/build_configuration_flags:enable_dynamic_configuration_in_datarouter=False",
"//score/datarouter/build_configuration_flags:file_transfer=False",
"//score/datarouter/build_configuration_flags:use_local_vlan=True"
],
"exclude_test_targets": [
"//score/datarouter/test/ut/ut_logging:dltprotocolUT",
"//score/datarouter/test/ut/ut_logging:persistentLogConfigUT",
"//score/datarouter/test/ut/ut_logging:socketserverConfigUT",
"//score/datarouter/test/ut/ut_logging:socketserverUT",
"//score/mw/log/legacy_non_verbose_api:unit_test"
]
}
}
},
"tooling": {
Expand All @@ -95,7 +111,6 @@
},
"score_bazel_platforms": {
"repo": "https://github.com/eclipse-score/bazel_platforms.git",
"hash": "3ac1b805ba42b58a13f8960f947b7866c8bcf26c",
"version": "0.0.4"
},
"score_test_scenarios": {
Expand All @@ -104,7 +119,6 @@
},
"score_docs_as_code": {
"repo": "https://github.com/eclipse-score/docs-as-code.git",
"hash": "ba006429268e6bd9b856088f7a4217742ed09025",
"version": "3.0.1"
},
"score_process": {
Expand Down
12 changes: 0 additions & 12 deletions patches/baselibs/0001-RH-exception-header.patch

This file was deleted.

Loading
Loading