Skip to content

Commit

Permalink
Merge pull request #2025 from SUSE/kiwi_sle16
Browse files Browse the repository at this point in the history
Set buildname/version for SLFO based development containers
  • Loading branch information
dcermak authored Nov 26, 2024
2 parents 6e39a80 + 17a2cbf commit 50990d4
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions src/bci_build/package/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,6 @@ class BaseContainerImage(abc.ABC):
# ``devel:BCI:SLE-15-SP$ver`` (on OBS) or ``SUSE:SLE-15-SP$ver:Update:BCI`` (on IBS)
package_name: str | None = None

#: Epoch to use for handling os_version downgrades
os_epoch: int | None = None

#: The container from which the build stage is running. On SLE15, this defaults to
#: ``suse/sle15:15.$SP`` for Application Containers and ``bci/bci-base:15.$SP``
#: for all other images. On openSUSE, ``opensuse/tumbleweed:latest`` is used
Expand Down Expand Up @@ -397,10 +394,9 @@ def build_name(self) -> str | None:
@property
def build_version(self) -> str | None:
if self.os_version.is_sle15:
epoch = ""
if self.os_epoch:
epoch = f"{self.os_epoch}."
return f"15.{epoch}{int(self.os_version.value)}"
return f"15.{int(self.os_version.value)}"
if self.os_version.is_slfo:
return str(self.os_version.value)
return None

@property
Expand Down

0 comments on commit 50990d4

Please sign in to comment.