particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pipeline: introduce detect_host_runner helper

Browse source 
Extract the existing code that creates the runner for the host
build container into a small helper method, so it can be re-used
in other places, like the tests.
This commit is contained in:
Christian Kellner 2020-10-20 17:50:21 +02:00 • committed by David Rheinsberg
parent 3010d247ea
commit 807090f4c8
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
osbuild/pipeline.py
View file

@ -360,6 +360,12 @@ class Pipeline:
return results
def detect_host_runner():
"""Use os-release(5) to detect the runner for the host"""
osname = osrelease.describe_os("/etc/os-release", "/usr/lib/os-release")
return "org.osbuild." + osname
def load_build(description, sources_options):
pipeline = description.get("pipeline")
if pipeline:
@ -375,7 +381,7 @@ def load(description, sources_options):
if build:
build_pipeline, runner = load_build(build, sources_options)
else:
build_pipeline, runner = None, "org.osbuild." + osrelease.describe_os("/etc/os-release", "/usr/lib/os-release")
build_pipeline, runner = None, detect_host_runner()
pipeline = Pipeline(runner, build_pipeline)