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

pipeline assemblers are stages now

Browse source 
Instead of using the `Assemblers` class to represent assemblers,
use the `Stage` class: The `Pipeline.add_assembler` method will
now instantiate and `Stage` instead of an `Assembler`. The tree
that the pipeline built is converted to an Input (while loading
the manifest description in `format/v1.py`) and all existing
assemblers are converted to use that input as the tree input.

The assembler run test is removed as the Assembler class itself
is not used (i.e. run) anymore.
This commit is contained in:
Christian Kellner 2021-01-15 18:34:28 +01:00 • committed by Tom Gundersen
parent ff7696a92e
commit 8ccc73d1c3
10 changed files with 39 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

4
assemblers/org.osbuild.noop
View file

@ -24,5 +24,7 @@ def main(_tree, _output_dir, options):
if __name__ == '__main__':
args = osbuild.api.arguments()
r = main(args["tree"], args["output_dir"], args.get("options", {}))
args_input = args["inputs"]["tree"]["path"]
args_output = args["tree"]
r = main(args_input, args_output, args.get("options", {}))
sys.exit(r)

4
assemblers/org.osbuild.oci-archive
View file

@ -272,5 +272,7 @@ def main(tree, output_dir, options):
if __name__ == '__main__':
args = osbuild.api.arguments()
r = main(args["tree"], args["output_dir"], args["options"])
args_input = args["inputs"]["tree"]["path"]
args_output = args["tree"]
r = main(args_input, args_output, args["options"])
sys.exit(r)

4
assemblers/org.osbuild.ostree.commit
View file

@ -185,5 +185,7 @@ def main(tree, output_dir, options, meta):
if __name__ == '__main__':
args = api.arguments()
r = main(args["tree"], args["output_dir"], args["options"], args["meta"])
args_input = args["inputs"]["tree"]["path"]
args_output = args["tree"]
r = main(args_input, args_output, args["options"], args["meta"])
sys.exit(r)

4
assemblers/org.osbuild.qemu
View file

@ -702,5 +702,7 @@ def main(tree, output_dir, options, loop_client):
if __name__ == '__main__':
args = osbuild.api.arguments()
ret = main(args["tree"], args["output_dir"], args["options"], remoteloop.LoopClient("/run/osbuild/api/remoteloop"))
args_input = args["inputs"]["tree"]["path"]
args_output = args["tree"]
ret = main(args_input, args_output, args["options"], remoteloop.LoopClient("/run/osbuild/api/remoteloop"))
sys.exit(ret)

4
assemblers/org.osbuild.rawfs
View file

@ -107,5 +107,7 @@ def main(tree, output_dir, options, loop_client):
if __name__ == '__main__':
args = osbuild.api.arguments()
r = main(args["tree"], args["output_dir"], args["options"], remoteloop.LoopClient("/run/osbuild/api/remoteloop"))
args_input = args["inputs"]["tree"]["path"]
args_output = args["tree"]
r = main(args_input, args_output, args["options"], remoteloop.LoopClient("/run/osbuild/api/remoteloop"))
sys.exit(r)

4
assemblers/org.osbuild.tar
View file

@ -80,5 +80,7 @@ def main(tree, output_dir, options):
if __name__ == '__main__':
args = osbuild.api.arguments()
r = main(args["tree"], args["output_dir"], args["options"])
args_input = args["inputs"]["tree"]["path"]
args_output = args["tree"]
r = main(args_input, args_output, args["options"])
sys.exit(r)

8
osbuild/formats/v1.py
View file

@ -2,6 +2,7 @@
from typing import Dict, List, Optional, Tuple
from osbuild.meta import Index, ValidationResult
from ..inputs import Input
from ..pipeline import Manifest, Pipeline, detect_host_runner
@ -69,7 +70,12 @@ def load_pipeline(description: Dict, index: Index, result: List[Pipeline]) -> Pi
a = description.get("assembler")
if a:
pipeline.set_assembler(a["name"], a.get("options", {}))
info = index.get_module_info("Assembler", a["name"])
asm = pipeline.set_assembler(info, a.get("options", {}))
info = index.get_module_info("Input", "org.osbuild.tree")
asm.inputs = {
"tree": Input(info, {"pipeline": {"id": pipeline.tree_id}})
}
result.append(pipeline)

19
osbuild/pipeline.py
View file

@ -187,8 +187,8 @@ class Pipeline:
self.assembler.base = stage.id
return stage
def set_assembler(self, name, options=None):
self.assembler = Assembler(name, self.build, self.tree_id, options or {})
def set_assembler(self, info, options=None):
self.assembler = Stage(info, {}, self.build, self.tree_id, options or {})
return self.assembler
def build_stages(self, object_store, monitor, libdir):
@ -268,7 +268,7 @@ class Pipeline:
return results, build_tree, tree
def assemble(self, object_store, build_tree, tree, monitor, libdir):
def assemble(self, object_store, build_tree, monitor, libdir):
results = {"success": True}
if not self.assembler:
@ -277,18 +277,16 @@ class Pipeline:
output = object_store.new()
with build_tree.read() as build_dir, \
tree.read() as input_dir, \
output.write() as output_dir:
monitor.assembler(self.assembler)
r = self.assembler.run(input_dir,
r = self.assembler.run(output_dir,
self.runner,
build_dir,
object_store,
monitor,
libdir,
output_dir,
var=object_store.store)
libdir)
monitor.result(r)
@ -316,16 +314,13 @@ class Pipeline:
obj = store.get(self.output_id)
if not obj:
results, build_tree, tree = self.build_stages(store,
monitor,
libdir)
results, build_tree, _ = self.build_stages(store, monitor, libdir)
if not results["success"]:
return results
r, obj = self.assemble(store,
build_tree,
tree,
monitor,
libdir)

6
test/mod/test_monitor.py
View file

@ -63,7 +63,8 @@ class TestMonitor(unittest.TestCase):
pipeline.add_stage(info, {
"isthisthereallife": False
})
pipeline.set_assembler("org.osbuild.noop")
info = index.get_module_info("Assembler", "org.osbuild.noop")
pipeline.set_assembler(info)
with tempfile.TemporaryDirectory() as tmpdir:
storedir = os.path.join(tmpdir, "store")
@ -100,7 +101,8 @@ class TestMonitor(unittest.TestCase):
pipeline.add_stage(noop_info, {
"isthisjustfantasy": True
})
pipeline.set_assembler("org.osbuild.noop")
info = index.get_module_info("Assembler", "org.osbuild.noop")
pipeline.set_assembler(info)
with tempfile.TemporaryDirectory() as tmpdir:
storedir = os.path.join(tmpdir, "store")

27
test/mod/test_osbuild.py
View file

@ -60,28 +60,6 @@ class TestDescriptions(unittest.TestCase):
self.assertEqual(res.success, True)
self.assertEqual(res.id, stage.id)
@unittest.skipUnless(test.TestBase.can_bind_mount(), "root-only")
def test_assembler_run(self):
asm = osbuild.Assembler("org.osbuild.noop", None, None, {})
with tempfile.TemporaryDirectory() as tmpdir:
data = pathlib.Path(tmpdir, "data")
cache = pathlib.Path(tmpdir, "cache")
output = pathlib.Path(tmpdir, "output")
root = pathlib.Path("/")
runner = detect_host_runner()
monitor = NullMonitor(sys.stderr.fileno())
libdir = os.path.abspath(os.curdir)
for p in [data, cache, output]:
p.mkdir()
res = asm.run(data, runner, root, monitor, libdir, output)
self.assertEqual(res.success, True)
self.assertEqual(res.id, asm.id)
def test_pipeline(self):
index = osbuild.meta.Index(os.curdir)
@ -91,7 +69,8 @@ class TestDescriptions(unittest.TestCase):
pipeline = osbuild.Pipeline("org.osbuild.test", build.tree_id)
pipeline.add_stage(test_info, {"one": 2})
pipeline.set_assembler("org.osbuild.test")
info = index.get_module_info("Assembler", "org.osbuild.noop")
pipeline.set_assembler(info)
manifest = osbuild.Manifest([build, pipeline], {})
@ -115,7 +94,7 @@ class TestDescriptions(unittest.TestCase):
}
],
"assembler": {
"name": "org.osbuild.test"
"name": "org.osbuild.noop"
}
}
})