fix showcases rpms + image building

.bazelrc

@@ -53,7 +53,7 @@ build:autosd-x86_64 --config=_common
 build:autosd-x86_64 --platforms=@score_bazel_platforms//:x86_64-linux
 build:autosd-x86_64 --force_pic
 build:autosd-x86_64 --extra_toolchains=@autosd_10_gcc_repo//:gcc_toolchain_linux_x86_64
-build:autosd-x86_64 --extra_toolchains=@rules_rpm//toolchains:linux_x86_64
+build:autosd-x86_64 --extra_toolchains=@rules_rpm//toolchain:linux_x86_64
 
 # Ferrocene Rust coverage config
 build:ferrocene-coverage --@rules_rust//rust/settings:extra_rustc_flag=-Cinstrument-coverage
@@ -75,4 +75,4 @@ coverage --features=coverage
 coverage --combined_report=lcov
 
 # user specific overrides (like proxy settings)
-try-import %workspace%/user.bazelrc
+try-import %workspace%/user.bazelrc

.github/workflows/build_and_test_autosd.yml

@@ -49,18 +49,16 @@ jobs:
           sudo apt-get update -y
           sudo apt-get install -y podman curl qemu-system createrepo-c
 
-      - name: Build Showcases RPMs
+      - name: Build Showcases
         run: |
-          bazel build --config autosd-x86_64 //images/autosd_x86_64:score-reference-integration
+          bazel build --config autosd-x86_64 //images/autosd_x86_64:image
         working-directory: ./images/autosd_x86_64
 
-      - name: Copy RPMs
+      - name: Copy showcases_all folder
         run: |
           set -e
           mkdir -p ./images/autosd_x86_64/build/rpms
-          cp bazel-bin/images/autosd_x86_64/score-reference-integration-0.6.0-1.x86_64.rpm ./images/autosd_x86_64/build/rpms
-          createrepo_c ./images/autosd_x86_64/build/rpms/
-          ls -l ./images/autosd_x86_64/build/rpms/
+          cp -R bazel-bin/showcases/showcases_all ./images/autosd_x86_64/build/files/
 
       - name: Install AIB Tools
         run: |
@@ -70,7 +68,6 @@ jobs:
 
       - name: Build AutoSD QEMU (x86_64)
         run: |
-          export AIB_PODMAN_OPTIONS="--tmpfs /var/tmp"
           export AIB_LOCAL_CONTAINER_STORAGE=$PWD/_build/containers-storage
 
           mkdir -p _build/containers-storage

.gitignore

@@ -28,4 +28,5 @@ __pycache__/
 /.gita/
 /.gita-workspace.csv
 build
+!images/autosd_x86_64/build/
 artifacts

bazel_common/score_basic_bazel.MODULE.bazel

@@ -1,11 +1,13 @@
 bazel_dep(name = "rules_shell", version = "0.6.0")
 bazel_dep(name = "rules_cc", version = "0.1.1")
 bazel_dep(name = "rules_pkg", version = "1.2.0")
+
 bazel_dep(name = "rules_rpm", version = "0.1.0")
 git_override(
     module_name = "rules_rpm",
+    remote = "https://github.com/eclipse-score/inc_os_autosd.git",
     branch = "main",
-    remote = "https://github.com/bilelmoussaoui/bazel-rpm.git",
+    strip_prefix = "rpm"
 )
 
 bazel_dep(name = "flatbuffers", version = "25.9.23")

bazel_common/score_gcc_toolchains.MODULE.bazel

@@ -69,7 +69,7 @@ autosd_10_gcc = use_extension("@os_autosd_toolchain//autosd_10_gcc:extensions.bz
 use_repo(autosd_10_gcc, "autosd_10_gcc_repo")
 
 # Register the RPM toolchain
-rpm_toolchain = use_extension("@rules_rpm//toolchains:extensions.bzl", "rpm_toolchain")
+rpm_toolchain = use_extension("@rules_rpm//toolchain:extensions.bzl", "rpm_toolchain")
 use_repo(rpm_toolchain, "rpm_toolchain")
 
 use_repo(eb, "gcc_toolchain", "gcc_toolchain_gcc")

images/autosd_x86_64/BUILD.bazel

@@ -10,7 +10,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # *******************************************************************************
-load("@rules_rpm//rpm:defs.bzl", "rpm_package")
+load("@rules_rpm//:defs.bzl", "rpm_package")
 
 alias(
     name = "image",
@@ -19,21 +19,34 @@ alias(
 )
 
 rpm_package(
-    name = "score-reference-integration",
-    description = "Eclipse S-CORE Reference Integration",
-    summary = "Eclipse S-CORE Reference Integration",
+    name = "score-showcases",
+    description = "Eclipse S-CORE Reference Integration Showcases",
+    summary = "Eclipse S-CORE Reference Integration Showcases",
     version = "0.6.0",
-    binaries = [
-        "//showcases/cli:cli",
-	    "//showcases/orchestration_persistency:orch_per_example",
-    ],
-    config_dir = "/etc/score",
     data = [
-	    "//showcases/orchestration_persistency:orch_per.score.json"
+        "//showcases:showcases_all"
     ],
     data_dir = "/usr/share/score/examples", 
 )
 
+# rpm_package(
+#     name = "score-reference-integration",
+#     description = "Eclipse S-CORE Reference Integration",
+#     summary = "Eclipse S-CORE Reference Integration",
+#     version = "0.6.0",
+#     binaries = [
+#         "//showcases/cli:cli",
+# 	"//showcases/kyron:kyron_example",
+# 	"//showcases/orchestration_persistency:orch_per_example",
+#     ],
+#     config_dir = "/etc/score",
+#     data = [
+#         "//showcases/kyron:kyron.score.json",
+# 	"//showcases/orchestration_persistency:orch_per.score.json"
+#     ],
+#     data_dir = "/usr/share/score/examples", 
+# )
+
 sh_binary(
     name = "run",
     srcs = ["//runners/docker_x86_64/scripts:run_docker.sh"],

images/autosd_x86_64/build/.gitignore

@@ -1,4 +1,5 @@
 _build/
+rpms/
 outputs/
 auto-image-builder.sh
 

images/autosd_x86_64/build/image.aib.yml

@@ -21,15 +21,10 @@ content:
   repos:
     - id: epel
       baseurl: https://dl.fedoraproject.org/pub/epel/10/Everything/$arch/
-    - id: score
-      baseurl: file:///host/rpms
+    # removing it for now because the image is relying on copying globs
+    #- id: score
+    #  baseurl: file:///host/rpms
   rpms:
-    - vim-enhanced
-    - gdb
-    - strace
-    - boost-devel
-    - tree
-    - dnf
     # For testing the image only:
     - openssh-server
     - openssh-clients
@@ -38,8 +33,6 @@ content:
     - bluechi-controller
     - bluechi-agent
     - bluechi-ctl
-    # score
-    - score-reference-integration
 
   make_dirs:
     - path: /etc/containers/systemd/qm.container.d
@@ -74,15 +67,59 @@ content:
     # lola test script
     - path: /usr/bin/lola-ipc-test
       source_path: files/lola-ipc-test
+    # showcases
+    - path: /usr/share/score/examples/showcases_all
+      source_glob: "files/showcases_all/**/*"
+      preserve_path: true
+      max_files: 50
+
   chmod_files:
     - path: /usr/bin/lola-ipc-test
       mode: "0755"
+    # the following is a workaround because copied files lost their permissions
+    - path: /usr/share/score/examples/showcases_all/bin/cli
+      mode: "0755"
+      recursive: true
+
+    - path: /usr/share/score/examples/showcases_all/bin/control_daemon
+      mode: "0755"
+      recursive: true
+
+    - path: /usr/share/score/examples/showcases_all/bin/cpp_supervised_app
+      mode: "0755"
+      recursive: true
+
+    - path: /usr/share/score/examples/showcases_all/bin/ipc_bridge_cpp
+      mode: "0755"
+      recursive: true
+
+    - path: /usr/share/score/examples/showcases_all/bin/kyron_example
+      mode: "0755"
+      recursive: true
+
+    - path: /usr/share/score/examples/showcases_all/bin/launch_manager
+      mode: "0755"
+      recursive: true
+
+    - path: /usr/share/score/examples/showcases_all/bin/lifecycle_signal.sh
+      mode: "0755"
+      recursive: true
+
+    - path: /usr/share/score/examples/showcases_all/bin/orch_per_example
+      mode: "0755"
+      recursive: true
+
+    - path: /usr/share/score/examples/showcases_all/bin/rust_supervised_app
+      mode: "0755"
+      recursive: true
+
 
   # Required for testing the image only:
   systemd:
     enabled_services:
       # Enable ssh daemon
       - sshd.service
+      # bluechi services
       - bluechi-controller.service
       - bluechi-agent.service
 
@@ -96,12 +133,8 @@ qm:
     repos:
       - id: epel
         baseurl: https://dl.fedoraproject.org/pub/epel/10/Everything/$arch/
-      - id: score
-        baseurl: file:///host/rpms
     rpms:
-      - boost-devel
       - bluechi-agent
-      - score-reference-integration
     add_files:
       # lola service files
       - path: /etc/systemd/system/lola-ipc-sub.service