Integrate simple lifecycle examples (#89)

pawelrutkaq · web-flow · commit f4e10b63dfd3 · 2026-02-11T16:01:22.000+01:00
* Integrate simple lifecycle examples

* Update to allow more custom layout

* Make QEMU close on ctrl+c

* Make CLI examples support more scenarios

* Tune settings and reuse cache

* USe latest modules versions

* Use special signal
diff --git a/.gitignore b/.gitignore
@@ -27,3 +27,4 @@ __pycache__/
 /score_*/
 /.gita/
 /.gita-workspace.csv
+integration/build
diff --git a/integration/MODULE.bazel b/integration/MODULE.bazel
@@ -49,15 +49,8 @@ git_override(
     remote = "https://github.com/bmw-software-engineering/trlc.git",
 )
 
-git_override(
-    module_name = "score_toolchains_qnx",
-    commit = "aa94b4fb566b989d1a00395c810df2cf254a0cec",
-    remote = "https://github.com/qorix-group/toolchains_qnx.git",
-)
-
-
 # Currently required for ifs tooling
-bazel_dep(name = "score_toolchains_qnx", version = "0.0.3")
+bazel_dep(name = "score_toolchains_qnx", version = "0.0.7")
 toolchains_qnx = use_extension("@score_toolchains_qnx//:extensions.bzl", "toolchains_qnx", dev_dependency=True)
 toolchains_qnx.sdp(
     sha256 = "f2e0cb21c6baddbcb65f6a70610ce498e7685de8ea2e0f1648f01b327f6bac63",
diff --git a/integration/bazel_common/bundlers.bzl b/integration/bazel_common/bundlers.bzl
@@ -2,7 +2,7 @@ load("@rules_pkg//pkg:pkg.bzl", "pkg_tar")
 load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
 
 
-def score_pkg_bundle(name, bins, config_data= None, package_dir = None, other_package_files = []):
+def score_pkg_bundle(name, bins, config_data= None, package_dir = None, other_package_files = [], custom_layout = {}):
     """
     Creates a reusable bundle by chaining Bazel packaging rules:
       - Collects binaries and config files into a pkg_files target, renaming them into subdirectories.
@@ -17,7 +17,12 @@ def score_pkg_bundle(name, bins, config_data= None, package_dir = None, other_pa
         config_data: Optional list of config file labels to include (placed in 'configs/').
         package_dir: Optional directory path for the package root inside the tar archive.
         other_package_files: Optional list of additional `NAME_pkg_files` to include in the tar archive that was created by other `score_pkg_bundle` targets.
-
+        custom_layout: Optional dict mapping labels -> destination path inside the package. All destination will be prefixed with "data/NAME/".
+            Example:
+                custom_layout = {
+                    "//app:data.txt": "resources/data.txt",
+                    "//lib:helper.sh": "scripts/helper.sh",
+                }
     """
 
     all_files_name = name + "_pkg_files"
@@ -37,10 +42,17 @@ def score_pkg_bundle(name, bins, config_data= None, package_dir = None, other_pa
     if config_data != None:
         config_data_arr = config_data
 
+
+    if custom_layout == None:
+        custom_layout = {}
+
+    for label, dst in custom_layout.items():
+        rename_dict[label] = "data/" + name + "/" + dst
+    
     # Step 1: pkg_files
     pkg_files(
         name = all_files_name,
-        srcs = bins + config_data_arr,
+        srcs = bins + config_data_arr  + list(custom_layout.keys()),
         renames = rename_dict,
         visibility = ["//visibility:public"],
     )
diff --git a/integration/bazel_common/score_basic_tools.MODULE.bazel b/integration/bazel_common/score_basic_tools.MODULE.bazel
@@ -16,3 +16,10 @@ git_override(
     branch = "main",
     remote = "https://github.com/bilelmoussaoui/bazel-rpm.git",
 )
+
+bazel_dep(name = "flatbuffers", version = "25.9.23")
+git_override(
+    module_name = "flatbuffers",
+    commit = "187240970746d00bbd26b0f5873ed54d2477f9f3",
+    remote = "https://github.com/google/flatbuffers.git",
+)
diff --git a/integration/bazel_common/score_modules.MODULE.bazel b/integration/bazel_common/score_modules.MODULE.bazel
@@ -33,4 +33,11 @@ single_version_override(
         "//patches/baselibs:0001-RH-exception-header.patch",
         "//patches/baselibs:0002-RH-algorithm-header.patch",
     ],
-)
+)
+
+bazel_dep(name = "score_lifecycle_health")
+git_override(
+    module_name = "score_lifecycle_health",
+    commit = "84303c2e48c7e8e2481752170efe82d0afd45f1e",
+    remote = "https://github.com/eclipse-score/lifecycle.git",
+)
diff --git a/integration/images/qnx_x86_64/build/system.build b/integration/images/qnx_x86_64/build/system.build
@@ -164,8 +164,7 @@ toybox                                   # Minimal Unix utilities collection (re
 [type=link] zcat=toybox                  # Display contents of compressed files
 [type=link] nc=toybox                    # Netcat for network connections and packet streaming
 [type=link] netcat=toybox                # Netcat alias for network connections
-
-
+[type=link] pkill=slay                   # Process killer Linux compatibility layer
 #############################################
 ### Tools ###
 #############################################
@@ -198,6 +197,7 @@ hostname
 route
 dhcpcd                                                                          # DHCP client daemon for automatic network configuration
 tcpdump                                                                         # Network packet capture tool for Wireshark analysis
+slay                                                                            
 /usr/lib/ssh/sftp-server=${QNX_TARGET}/${PROCESSOR}/usr/libexec/sftp-server     # File transfer server to enable scp
 
 #############################################
diff --git a/integration/runners/docker_x86_64/scripts/run_docker.sh b/integration/runners/docker_x86_64/scripts/run_docker.sh
@@ -21,4 +21,4 @@ echo "Starting docker with overlay image: ${OVERLAY_ABS_PATH}"
 docker run --rm -it \
     -v "${OVERLAY_ABS_PATH}:/showcases" \
     ubuntu:22.04 \
-    /showcases/bin/cli
+    bash -c "/showcases/bin/cli; exec bash"
diff --git a/integration/runners/qemu_x86_64/scripts/run_qemu.sh b/integration/runners/qemu_x86_64/scripts/run_qemu.sh
@@ -20,13 +20,16 @@ QNX_HOST=$1
 IFS_IMAGE=$2
 echo "Starting QEMU with IFS image: ${IFS_IMAGE}"
 qemu-system-x86_64 \
+                -enable-kvm \
                 -smp 2 \
-                -cpu Cascadelake-Server-v5 \
+                -cpu host\
                 -m 1G \
                 -pidfile /tmp/qemu.pid \
                 -nographic \
                 -kernel "${IFS_IMAGE}" \
-                -serial mon:stdio \
+                -chardev stdio,id=char0,signal=on,mux=on \
+                -mon chardev=char0,mode=readline \
+                -serial chardev:char0 \
                 -object rng-random,filename=/dev/urandom,id=rng0 \
                 -netdev bridge,id=net0,br=virbr0 -device virtio-net-pci,netdev=net0 \
-                -device virtio-rng-pci,rng=rng0 
+                -device virtio-rng-pci,rng=rng0
diff --git a/integration/score_starter b/integration/score_starter
@@ -9,12 +9,12 @@ import argparse
 # ================== CONFIG ==================
 # Each entry: (description, command, name)
 mEntries = [
-    ("Run QNX x86_64 QEMU", "bazel run --config qnx-x86_64 //images/qnx_x86_64:run", "qnx-x86_64"),
-    ("Run Linux x86_64 Docker", "bazel run --config linux-x86_64 //images/linux_x86_64:run", "linux-x86_64"),
+    ("Run QNX x86_64 QEMU", "bazel --output_base=build/qnx-x86_64 run --config qnx-x86_64  //images/qnx_x86_64:run", "qnx-x86_64"),
+    ("Run Linux x86_64 Docker", "bazel --output_user_root=build/linux-x86_64 run --config linux-x86_64  //images/linux_x86_64:run", "linux-x86_64"),
     ("Run Elektrobit Corbos aarch64 QEMU",
-     "bazel build --config eb-aarch64 //images/ebclfsa_aarch64/scrample_integration:run", "eb-aarch64"),
+     "bazel --output_user_root=build/eb-aarch64 build --config eb-aarch64  //images/ebclfsa_aarch64/scrample_integration:run", "eb-aarch64"),
     ("Build Autosd x86_64 RPM",
-     "bazel build --config autosd-x86_64 //images/autosd_x86_64:lola-demo", "autosd-x86_64"),
+     "bazel --output_user_root=build/autosd-x86_64 build --config autosd-x86_64  //images/autosd_x86_64:lola-demo", "autosd-x86_64"),
     ("Exit", "exit 0", "exit"),
 ]
 
@@ -47,6 +47,7 @@ def run_entry(entry):
         sys.exit(0)
 
     # Run command in user's shell
+    print("Running ", cmd)
     result = subprocess.call(cmd, shell=True)
     sys.exit(result)
 
diff --git a/integration/showcases/BUILD b/integration/showcases/BUILD
@@ -16,7 +16,12 @@ score_pkg_bundle(
     name = "showcases_all",
     # package_dir = "",
     bins = ["//showcases/cli" ],
-    other_package_files = ["//showcases/standalone:standalone_pkg_files", "//showcases/kyron:kyron_pkg_files", "//showcases/orchestration_persistency:orch_per_pkg_files"],
+    other_package_files = [
+        "//showcases/standalone:standalone_pkg_files", 
+        "//showcases/kyron:kyron_pkg_files", 
+        "//showcases/orchestration_persistency:orch_per_pkg_files",
+        "//showcases/simple_lifecycle:simple_lifecycle_pkg_files",
+    ],
  
 )
 
diff --git a/integration/showcases/cli/README.md b/integration/showcases/cli/README.md
@@ -13,15 +13,26 @@ To make this work each example shall deploy configuration file `name.score.json`
 {
     "name": "Name of example",
     "description": "Extensive description",
-    "path": "exec_path",
-    "args": [
-        // args to be used when running
-    ],
-    "env": {
-        // env to be used when running
-    }
+    "apps": [
+        {
+            "path": "exec_path",
+            "args": [
+                // args to be used when running
+            ],
+            "env": {
+                // env to be used when running
+            },
+            "delay": "number" // Optional delay between two consecutive apps 
+        },
+        {
+            // ...
+        }
+    ]
+
 }
 
+Each example can run multiple executables, providing additional `apps` configs. This will be started one after another but not blocking each-other.
+
 ```
 
 You can customize where to look for examples using env `SCORE_CLI_INIT_DIR`.
diff --git a/integration/showcases/cli/main.rs b/integration/showcases/cli/main.rs
@@ -4,18 +4,27 @@ use std::{
     collections::HashMap,
     env, fs,
     path::Path,
-    process::Command,
 };
 
 use cliclack::{clear_screen, intro, multiselect, outro, confirm};
+use std::time::Duration;
+use std::process::Command;
+use std::process::Child;
 
-#[derive(Debug, Deserialize)]
-struct ScoreConfig {
-    name: String,
-    description: String,
+#[derive(Debug, Deserialize, Clone)]
+struct AppConfig {
     path: String,
+    dir: Option<String>,
     args: Vec<String>,
     env: HashMap<String, String>,
+    delay: Option<u64>, // delay in seconds before running the next app
+}
+
+#[derive(Debug, Deserialize, Clone)]
+struct ScoreConfig {
+    name: String,
+    description: String,
+    apps: Vec<AppConfig>,
 }
 
 fn print_banner() {
@@ -65,7 +74,7 @@ fn main() -> Result<()> {
         .map(|(i, c)| (i, c.name.clone(), c.description.clone()))
         .collect();
 
-    let selected: Vec<usize> = multiselect("Select examples to run:")
+    let selected: Vec<usize> = multiselect("Select examples to run (use space to select (multiselect supported), enter to run examples):")
         .items(&options)
         .interact()?;
 
@@ -118,23 +127,53 @@ fn is_score_file(path: &Path) -> bool {
 }
 
 fn run_score(config: &ScoreConfig) -> Result<()> {
-    println!("▶ Running: {}", config.name);
-    
-    let mut cmd = Command::new(&config.path);
-    cmd.args(&config.args);
-    cmd.envs(&config.env);
-    
-    let status = cmd
-        .status()
-        .with_context(|| format!("Failed to execute {}", config.path))?;
-    
-    if !status.success() {
-        anyhow::bail!(
-            "Command `{}` exited with status {}",
-            config.path,
-            status
-        );
+    println!("▶ Running example: {}", config.name);
+
+    let mut children: Vec<(usize, String, Child)> = Vec::new();
+
+    let now = std::time::Instant::now();
+    println!("{:?} Starting example '{}'", now.elapsed(), config.name);
+    for (i, app) in config.apps.iter().enumerate() {
+        let app = app.clone(); // Clone for ownership
+
+        if let Some(delay_secs) = app.delay {
+            if delay_secs > 0 {
+                println!("{:?}  App {}: waiting {} seconds before start...", now.elapsed(), i + 1, delay_secs);
+                std::thread::sleep(Duration::from_secs(delay_secs));
+            }
+        }
+
+        println!("{:?} App {}: starting {}", now.elapsed(), i + 1, app.path);
+
+        let mut cmd = Command::new(&app.path);
+        cmd.args(&app.args);
+        cmd.envs(&app.env);
+        if let Some(ref dir) = app.dir {
+            cmd.current_dir(dir);
+        }
+
+        let child = cmd
+            .spawn()
+            .with_context(|| format!("Failed to start app {}: {}", i + 1, app.path))?;
+
+        println!("App {}: spawned command {:?}", i + 1, cmd);
+
+        children.push((i + 1, app.path.clone(), child));
     }
-    
+
+    // Wait for all children
+    for (i, path, mut child) in children {
+        let status = child
+            .wait()
+            .with_context(|| format!("Failed to wait for app {}: {}", i, path))?;
+
+        if !status.success() {
+            // anyhow::bail!("App {}: command `{}` exited with status {}", i, path, status);
+        }
+
+        println!("App {}: finished {}", i, path);
+    }
+
+    println!("✅ Example '{}' finished successfully.", config.name);
     Ok(())
-}
+}
diff --git a/integration/showcases/kyron/kyron.score.json b/integration/showcases/kyron/kyron.score.json
@@ -1,9 +1,13 @@
 {
     "name": "Kyron example",
     "description": "Example for channel communication using safe async runtime - Kyron",
-    "path": "/showcases/bin/kyron_example",
-    "args": [
-    ],
-    "env": {
-    }
-}
+    "apps":[
+        {
+            "path": "/showcases/bin/kyron_example",
+            "args": [
+            ],
+            "env": {
+            }
+        }
+    ]
+}
diff --git a/integration/showcases/orchestration_persistency/orch_per.score.json b/integration/showcases/orchestration_persistency/orch_per.score.json
@@ -1,9 +1,13 @@
 {
     "name": "Orchestration persistency - Kyron example",
     "description": "Example for running orchestration graph with Kyron runtime and saving the state to disk",
-    "path": "/showcases/bin/orch_per_example",
-    "args": [
-    ],
-    "env": {
-    }
-}
+    "apps":[
+        {
+            "path": "/showcases/bin/orch_per_example",
+            "args": [
+            ],
+            "env": {
+            }
+        }
+    ]
+}
diff --git a/integration/showcases/simple_lifecycle/BUILD b/integration/showcases/simple_lifecycle/BUILD
diff --git a/integration/showcases/simple_lifecycle/configs/BUILD b/integration/showcases/simple_lifecycle/configs/BUILD
diff --git a/integration/showcases/simple_lifecycle/configs/hm_demo.json b/integration/showcases/simple_lifecycle/configs/hm_demo.json
diff --git a/integration/showcases/simple_lifecycle/configs/lm_demo.json b/integration/showcases/simple_lifecycle/configs/lm_demo.json
diff --git a/integration/showcases/simple_lifecycle/configs/supervised_app_demo.json b/integration/showcases/simple_lifecycle/configs/supervised_app_demo.json
diff --git a/integration/showcases/simple_lifecycle/simple_lifecycle.score.json b/integration/showcases/simple_lifecycle/simple_lifecycle.score.json
