Merge pull request #2202 from SUSE/git_pkg_version_check

Add version check for git container as well

src/bci_build/package/git.py

@@ -1,16 +1,13 @@
 """Container description for the Git application container."""
 
-from bci_build.container_attributes import BuildType
-from bci_build.container_attributes import PackageType
 from bci_build.container_attributes import SupportLevel
 from bci_build.os_version import ALL_NONBASE_OS_VERSIONS
 from bci_build.os_version import CAN_BE_LATEST_OS_VERSION
-from bci_build.os_version import OsVersion
 from bci_build.package import ApplicationStackContainer
-from bci_build.package import Package
 from bci_build.package import ParseVersion
 from bci_build.package import Replacement
 from bci_build.package.helpers import generate_from_image_tag
+from bci_build.package.helpers import generate_package_version_check
 from bci_build.package.versions import format_version
 from bci_build.package.versions import get_pkg_version
 
@@ -21,12 +18,11 @@
         support_level=SupportLevel.L3,
         pretty_name=f"{os_version.pretty_os_version_no_dash} with Git",
         custom_description="A micro environment with Git {based_on_container}.",
-        from_image=generate_from_image_tag(os_version, "bci-micro"),
-        build_recipe_type=BuildType.KIWI,
+        from_target_image=generate_from_image_tag(os_version, "bci-micro"),
         is_latest=os_version in CAN_BE_LATEST_OS_VERSION,
         version="%%git_version%%",
         tag_version=format_version(
-            get_pkg_version("git", os_version), ParseVersion.MINOR
+            git_version := get_pkg_version("git", os_version), ParseVersion.MINOR
         ),
         additional_versions=["%%git_major_version%%"],
         version_in_uid=False,
@@ -43,16 +39,12 @@
         ],
         license="GPL-2.0-only",
         package_list=[
-            Package(name, pkg_type=PackageType.BOOTSTRAP)
-            for name in (
-                "git-core",
-                "openssh-clients",
-            )
-            + (() if os_version == OsVersion.TUMBLEWEED else ("skelcd-EULA-bci",))
+            "git-core",
+            "openssh-clients",
         ],
-        # intentionally empty
-        config_sh_script="""
-""",
+        build_stage_custom_end=generate_package_version_check(
+            "git-core", git_version, ParseVersion.MINOR, use_target=True
+        ),
     )
     for os_version in ALL_NONBASE_OS_VERSIONS
 ]