Skip to content

Commit

Permalink
Merge pull request #668 from SUSE/lifecycle
Browse files Browse the repository at this point in the history
Add the lifecycle information inside the container
  • Loading branch information
dirkmueller authored Sep 28, 2023
2 parents d4628bb + b5d17c8 commit 879cc2f
Showing 1 changed file with 16 additions and 3 deletions.
19 changes: 16 additions & 3 deletions src/bci_build/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,12 @@ def pretty_os_version_no_dash(self) -> str:

return f"15 SP{self.value}"

@property
def lifecycle_data_pkg(self) -> List[str]:
if self.value not in (OsVersion.BASALT.value, OsVersion.TUMBLEWEED.value):
return ["lifecycle-data-sle-module-development-tools"]
return []


#: Operating system versions that have the label ``com.suse.release-stage`` set
#: to ``released``.
Expand Down Expand Up @@ -1454,7 +1460,8 @@ def _get_python_kwargs(
if is_system_py or os_version == OsVersion.TUMBLEWEED
else []
)
+ ([f"{py3}-pipx"] if os_version == OsVersion.TUMBLEWEED else []),
+ ([f"{py3}-pipx"] if os_version == OsVersion.TUMBLEWEED else [])
+ os_version.lifecycle_data_pkg,
"replacements_via_service": [
Replacement(
regex_in_build_description=py3_ver_replacement,
Expand Down Expand Up @@ -1639,7 +1646,12 @@ def _get_golang_kwargs(
{DOCKERFILE_RUN} if zypper -n install {go}-race; then zypper -n clean; rm -rf /var/log/*; fi
"""
),
"package_list": [*go_packages, "make", "git-core"],
"package_list": [
*go_packages,
"make",
"git-core",
]
+ os_version.lifecycle_data_pkg,
"extra_files": {
# the go binaries are huge and will ftbfs on workers with a root partition with 4GB
"_constraints": generate_disk_size_constraints(8)
Expand Down Expand Up @@ -2510,7 +2522,8 @@ def _get_nginx_kwargs(os_version: OsVersion):
package_list=[
f"rust{rust_version}",
f"cargo{rust_version}",
],
]
+ os_version.lifecycle_data_pkg,
version=rust_version,
env={
"RUST_VERSION": "%%RUST_VERSION%%",
Expand Down

0 comments on commit 879cc2f

Please sign in to comment.