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

pipeline: implement get_buildtree like store.get

Browse source 
Refactor `get_buildtree` to do input/output via `Object`, i.e. by
creating a new `Object`, setting its base accordingly and then
use its `read` and `write` methods. This is what `ObjectStore.get`
does as well.
In the case that there is no build pipeline, use the mount helpers
of `objectstore` instead of the custom mount calls.
This commit is contained in:
Christian Kellner 2020-02-18 18:31:34 +01:00 • committed by Tom Gundersen
parent 42a365d12f
commit 29397efcec
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
osbuild/pipeline.py
View file

@ -228,15 +228,17 @@ class Pipeline:
@contextlib.contextmanager @contextlib.contextmanager
def get_buildtree(self, object_store): def get_buildtree(self, object_store):
if self.build: if self.build:
with object_store.get(self.build.tree_id) as tree: with object_store.new() as tree:
yield tree tree.base = self.build.tree_id
with tree.read() as path:
yield path
else: else:
with tempfile.TemporaryDirectory(dir=object_store.store) as tmp: with object_store.tempdir() as tmp:
subprocess.run(["mount", "--make-private", "-o", "bind,ro,mode=0755", "/", tmp], check=True) objectstore.mount("/", tmp)
try: try:
yield tmp yield tmp
finally: finally:
subprocess.run(["umount", "--lazy", tmp], check=True) objectstore.umount(tmp)
def run(self, store, interactive=False, libdir=None, secrets=None): def run(self, store, interactive=False, libdir=None, secrets=None):
os.makedirs("/run/osbuild", exist_ok=True) os.makedirs("/run/osbuild", exist_ok=True)