Use py_itf_test rule with select support

- Update score_itf to 44c75de and score_bazel_platforms to b72a5c3 in
  known_good.json and MODULE.bazel overrides
- Add explicit bazel_dep on platforms 1.0.0 (required by new config_settings)
- Merge the two py_itf_test targets (linux_x86_64, qnx_x86_64) in
  feature_integration_tests/itf/BUILD into a single 'itf' target that uses
  config_setting + select() to switch args/data/plugins per platform;
  keep backward-compatible aliases for the old target names
- Upgrade rules_oci from 1.8.0 to 2.2.7; adapt docker images
  to use oci_load (replacing the removed oci_tarball) and add the
  platform-specific repo variants

Author: Lukasz Tekieli

.github/workflows/build_and_test_linux.yml

@@ -47,4 +47,4 @@ jobs:
           bazel build --lockfile_mode=error --config=linux-x86_64 //images/linux_x86_64:image
       - name: Integration tests
         run: |
-          bazel test --lockfile_mode=error --config=linux-x86_64 //feature_integration_tests/itf:linux_x86_64
+          bazel test --lockfile_mode=error --config=linux-x86_64 //feature_integration_tests/itf

.github/workflows/build_and_test_qnx.yml

@@ -73,7 +73,7 @@ jobs:
           bazel build --lockfile_mode=error --config qnx-x86_64 //images/qnx_x86_64:image
       - name: Run integration tests
         run: |
-          bazel test --lockfile_mode=error --config=itf-qnx-x86_64 //feature_integration_tests/itf:qnx_x86_64
+          bazel test --lockfile_mode=error --config=itf-qnx-x86_64 //feature_integration_tests/itf
       - name: Cleanup QNX license
         if: always()
         run: sudo rm -rf /opt/score_qnx

MODULE.bazel.lock

@@ -10,6 +10,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # *******************************************************************************
+
+bazel_dep(name = "platforms", version = "1.0.0")
 bazel_dep(name = "rules_shell", version = "0.6.0")
 bazel_dep(name = "rules_cc", version = "0.2.16")
 bazel_dep(name = "rules_pkg", version = "1.2.0")

bazel_common/score_basic_bazel.MODULE.bazel

@@ -1,4 +1,4 @@
-bazel_dep(name = "rules_oci", version = "1.8.0")
+bazel_dep(name = "rules_oci", version = "2.2.7")
 
 oci = use_extension("@rules_oci//oci:extensions.bzl", "oci")
 oci.pull(
@@ -15,4 +15,5 @@ oci.pull(
     platforms = ["linux/amd64"],
     tag = "stream10",
 )
-use_repo(oci, "centos_stream10", "ubuntu_22_04")
+use_repo(oci, "centos_stream10", "centos_stream10_linux_amd64")
+use_repo(oci, "ubuntu_22_04", "ubuntu_22_04_linux_amd64")

bazel_common/score_images.MODULE.bazel

@@ -24,7 +24,7 @@ git_override(
 bazel_dep(name = "score_itf")
 git_override(
     module_name = "score_itf",
-    commit = "e1243f3818fd78b72f79741082016fd3d7c85329",
+    commit = "44c75debab696a9c967455110a2c32f201159cdd",
     remote = "https://github.com/eclipse-score/itf.git",
 )
 
@@ -45,7 +45,7 @@ git_override(
 bazel_dep(name = "score_bazel_platforms")
 git_override(
     module_name = "score_bazel_platforms",
-    commit = "2286de89c35d5660ad183906a6f010b33fcac8db",
+    commit = "b72a5c3510ca423efc71fef9a93d82f974b089a4",
     remote = "https://github.com/eclipse-score/bazel_platforms.git",
 )
 

bazel_common/score_modules_tooling.MODULE.bazel

@@ -11,7 +11,24 @@
 # SPDX-License-Identifier: Apache-2.0
 # *******************************************************************************
 load("@score_itf//:defs.bzl", "py_itf_test")
-load("@score_itf//score/itf/plugins:plugins.bzl", "docker", "qemu")
+
+config_setting(
+    name = "config_linux_x86_64",
+    constraint_values = [
+        "@platforms//os:linux",
+        "@platforms//cpu:x86_64",
+        "@score_bazel_platforms//runtime_es:posix",
+    ],
+)
+
+config_setting(
+    name = "config_qnx_x86_64",
+    constraint_values = [
+        "@platforms//os:qnx",
+        "@platforms//cpu:x86_64",
+        "@score_bazel_platforms//runtime_es:posix",
+    ],
+)
 
 filegroup(
     name = "all_tests",
@@ -22,42 +39,61 @@ filegroup(
 )
 
 py_itf_test(
-    name = "linux_x86_64",
+    name = "itf",
     srcs = [
         ":all_tests",
     ],
-    args = [
-        "--docker-image-bootstrap=$(location //images/linux_x86_64:image_tarball)",
-        "--docker-image=score_showcases:latest",
-    ],
-    data = [
-        "//images/linux_x86_64:image_tarball",
-    ],
-    plugins = [
-        docker,
+    args = select(
+        {
+            ":config_linux_x86_64": [
+                "--docker-image-bootstrap=$(location //images/linux_x86_64:image_load)",
+                "--docker-image=score_showcases:latest",
+            ],
+            ":config_qnx_x86_64": [
+                "--qemu-config=$(location //feature_integration_tests/configs:qemu_bridge_config.json)",
+                "--qemu-image=$(location //images/qnx_x86_64:image)",
+            ],
+        },
+        no_match_error = "Unsupported platform",
+    ),
+    data = select({
+        ":config_linux_x86_64": [
+            "//images/linux_x86_64:image_load",
+        ],
+        ":config_qnx_x86_64": [
+            "//feature_integration_tests/configs:qemu_bridge_config.json",
+            "//images/qnx_x86_64:image",
+        ],
+    }),
+    plugins = select(
+        {
+            ":config_linux_x86_64": [
+                "@score_itf//score/itf/plugins:docker_plugin",
+            ],
+            ":config_qnx_x86_64": [
+                "@score_itf//score/itf/plugins:qemu_plugin",
+            ],
+        },
+        no_match_error = "Unsupported platform",
+    ),
+    tags = [
+        "manual",
     ],
+)
+
+# Backward compatible aliases for CI jobs - these should be removed once the CI jobs are updated to use the new target names
+test_suite(
+    name = "linux_x86_64",
     tags = [
         "manual",
     ],
+    tests = [":itf"],
 )
 
-py_itf_test(
+test_suite(
     name = "qnx_x86_64",
-    srcs = [
-        ":all_tests",
-    ],
-    args = [
-        "--qemu-config=$(location //feature_integration_tests/configs:qemu_bridge_config.json)",
-        "--qemu-image=$(location //images/qnx_x86_64:image)",
-    ],
-    data = [
-        "//feature_integration_tests/configs:qemu_bridge_config.json",
-        "//images/qnx_x86_64:image",
-    ],
-    plugins = [
-        qemu,
-    ],
     tags = [
         "manual",
     ],
+    tests = [":itf"],
 )

feature_integration_tests/itf/BUILD

@@ -1,4 +1,4 @@
-load("@rules_oci//oci:defs.bzl", "oci_image", "oci_tarball")
+load("@rules_oci//oci:defs.bzl", "oci_image", "oci_load")
 
 # *******************************************************************************
 # Copyright (c) 2024 Contributors to the Eclipse Foundation
@@ -27,12 +27,12 @@ rpm_package(
 
 sh_binary(
     name = "run",
-    srcs = ["//runners/docker_x86_64/scripts:run_docker.sh"],
+    srcs = ["//runners/docker_x86_64/scripts:run_docker"],
     args = [
-        "$(location :image_tarball)",
+        "$(location :image_load)",
     ],
     data = [
-        ":image_tarball",
+        ":image_load",
     ],
     env = {
         "OCI_IMAGE": "score_showcases_autosd:latest",
@@ -41,14 +41,14 @@ sh_binary(
 
 oci_image(
     name = "image",
-    base = "@centos_stream10",
+    base = "@centos_stream10_linux_amd64",
     tars = [
         "//showcases:showcases_pkg_tar",
     ],
 )
 
-oci_tarball(
-    name = "image_tarball",
+oci_load(
+    name = "image_load",
     image = ":image",
     repo_tags = ["score_showcases_autosd:latest"],
     visibility = [

images/autosd_x86_64/BUILD.bazel

@@ -10,18 +10,20 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # *******************************************************************************
-load("@rules_oci//oci:defs.bzl", "oci_image", "oci_tarball")
+load("@rules_oci//oci:defs.bzl", "oci_image", "oci_load")
 load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
 load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
 
 sh_binary(
     name = "run",
-    srcs = ["//runners/docker_x86_64/scripts:run_docker.sh"],
+    srcs = [
+        "//runners/docker_x86_64/scripts:run_docker",
+    ],
     args = [
-        "$(location :image_tarball)",
+        "$(location :image_load)",
     ],
     data = [
-        ":image_tarball",
+        ":image_load",
     ],
     env = {
         "OCI_IMAGE": "score_showcases:latest",
@@ -30,14 +32,14 @@ sh_binary(
 
 oci_image(
     name = "image",
-    base = "@ubuntu_22_04",
+    base = "@ubuntu_22_04_linux_amd64",
     tars = [
         "//showcases:showcases_pkg_tar",
     ],
 )
 
-oci_tarball(
-    name = "image_tarball",
+oci_load(
+    name = "image_load",
     image = ":image",
     repo_tags = ["score_showcases:latest"],
     visibility = [

images/linux_x86_64/BUILD

@@ -118,7 +118,7 @@
             },
             "score_itf": {
                 "repo": "https://github.com/eclipse-score/itf.git",
-                "hash": "e1243f3818fd78b72f79741082016fd3d7c85329"
+                "hash": "44c75debab696a9c967455110a2c32f201159cdd"
             },
             "score_tooling": {
                 "repo": "https://github.com/eclipse-score/tooling.git",
@@ -130,7 +130,7 @@
             },
             "score_bazel_platforms": {
                 "repo": "https://github.com/eclipse-score/bazel_platforms.git",
-                "hash": "2286de89c35d5660ad183906a6f010b33fcac8db"
+                "hash": "b72a5c3510ca423efc71fef9a93d82f974b089a4"
             },
             "score_test_scenarios": {
                 "repo": "https://github.com/eclipse-score/testing_tools.git",