Add test_environment & test_marker properties to BCI

Author: dcermak

src/bci_build/package/__init__.py

@@ -46,6 +46,7 @@
 #: that would also remove some package owned directories (not %ghost)
 LOG_CLEAN: str = "rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}"
 
+
 #: The string to use as a placeholder for the build source services to put in the release number
 _RELEASE_PLACEHOLDER = "%RELEASE%"
 
@@ -311,6 +312,10 @@ class BaseContainerImage(abc.ABC):
     #: The registry implementation for which this container is being built.
     _publish_registry: Registry | None = None
 
+    #: A custom name for the test environment if it is not equal to the
+    #: container image's name
+    _custom_test_env: str = ""
+
     @property
     def publish_registry(self) -> Registry:
         assert self._publish_registry
@@ -377,6 +382,20 @@ def oci_version(self) -> str:
         """
         pass
 
+    @property
+    @abc.abstractmethod
+    def test_marker(self) -> str:
+        """The marker used to identify this image in BCI-Tests"""
+        pass
+
+    @property
+    def test_environment(self) -> str:
+        """The test environment name in BCI-Tests corresponding to this
+        container image
+
+        """
+        return self._custom_test_env or self.name
+
     @property
     def build_name(self) -> str | None:
         if self.build_tags:
@@ -1198,6 +1217,10 @@ def prepare_template(self) -> None:
     def registry_prefix(self) -> str:
         return self.publish_registry.registry_prefix(is_application=False)
 
+    @property
+    def test_marker(self) -> str:
+        return f"{self.name}_{self.stability_tag or self.version}"
+
     @property
     def image_type(self) -> ImageType:
         return ImageType.SLE_BCI
@@ -1368,6 +1391,13 @@ def version_to_container_os_version(os_version: OsVersion) -> str:
             return str(os_version)
         return f"15.{os_version}"
 
+    @property
+    def test_marker(self) -> str:
+        return (
+            f"bci-{self.name}_{OsContainer.version_to_container_os_version(self.os_version)}"
+            + ("-ltss" if self.os_version.is_ltss else "")
+        )
+
     @property
     def uid(self) -> str:
         return self.name

src/bci_build/package/basecontainers.py

@@ -35,6 +35,7 @@
         pretty_name=f"{os_version.pretty_os_version_no_dash} Micro",
         custom_description="A micro environment for containers {based_on_container}.",
         from_image=None,
+        _custom_test_env="minimal",
         build_recipe_type=BuildType.KIWI,
         package_list=[
             Package(name, pkg_type=PackageType.BOOTSTRAP)
@@ -309,6 +310,7 @@ def _get_minimal_kwargs(os_version: OsVersion):
             logo_url="https://opensource.suse.com/bci/SLE_BCI_logomark_green.svg",
             os_version=os_version,
             supported_until=_SUPPORTED_UNTIL_SLE.get(os_version),
+            _custom_test_env="kernel_module",
             is_latest=os_version in CAN_BE_LATEST_OS_VERSION,
             package_list=(
                 [

src/bci_build/package/node.py

@@ -60,6 +60,7 @@ def _get_node_kwargs(ver: _NODE_VERSIONS, os_version: OsVersion):
             "NODE_VERSION": ver,
         },
         "_min_release_counter": 30,
+        "_custom_test_env": "node",
     }
 
 

src/bci_build/package/openjdk.py

@@ -68,6 +68,7 @@ def _get_openjdk_kwargs(
             "package_list": [f"java-{java_version}-openjdk-devel", "maven"],
             "cmd": ["/usr/bin/jshell"],
             "from_image": f"{_build_tag_prefix(os_version)}/openjdk:{java_version}",
+            "_custom_test_env": "openjdk_devel",
         }
     return common | {
         "name": "openjdk",

src/bci_build/package/php.py

@@ -188,6 +188,7 @@ def _create_php_bci(
         },
         custom_end=custom_end,
         _min_release_counter=30,
+        _custom_test_env="php",
     )
 
 

src/dotnet/updater.py

@@ -194,6 +194,7 @@ def __post_init__(self):
         self.custom_labelprefix_end = self.name.replace("-", ".")
         self.exclusive_arch = _DOTNET_EXCLUSIVE_ARCH
         self._min_release_counter = {"8.0": 20, "6.0": 32}[str(self.tag_version)]
+        self._custom_test_env = "dotnet"
 
     def _fetch_ordinary_package(self, pkg: str | Package) -> list[RpmPackage]:
         """Fetches the package `pkg` from the microsoft .Net repository and