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

pipeline: plain results for stages, assembler

Browse source 
The exception that was thrown by {stage.run, assembler.run} was a
necessary ingredient that in combination with the context manager
around `Objectstore.new` made sure that tree the object was only
auto-committed to the store when there was no error during the
executing of any of the `.run` methods.
Now that the auto-commit feature got removed and committing of any
object to the store is explicitly done via `objectstore.commit`,
the whole exception throwing and handling can be removed. Status
reporting was already done in `BuildResult.success` and the new
code will use that to exit the function early on stage/asm errors.
This commit is contained in:
Christian Kellner 2020-02-20 11:34:50 +01:00 • committed by Tom Gundersen
parent 2fa9f86112
commit 2266d3fada
1 changed files with 31 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

82
osbuild/pipeline.py
View file

@ -30,15 +30,6 @@ class BuildResult:
return vars(self)
class BuildError(Exception):
def __init__(self, result):
super(BuildError, self).__init__()
self.result = result
def as_dict(self):
return self.result.as_dict()
def print_header(title, options):
print()
print(f"{RESET}{BOLD}{title}{RESET} " + json.dumps(options or {}, indent=2))
@ -113,10 +104,7 @@ class Stage:
readonly_binds=ro_binds,
stdin=subprocess.DEVNULL,
)
res = BuildResult(self, r.returncode, api.output)
if not res.success:
raise BuildError(res)
return res
return BuildResult(self, r.returncode, api.output)
class Assembler:
@ -173,10 +161,7 @@ class Assembler:
readonly_binds=ro_binds,
stdin=subprocess.DEVNULL,
)
res = BuildResult(self, r.returncode, api.output)
if not res.success:
raise BuildError(res)
return res
return BuildResult(self, r.returncode, api.output)
class Pipeline:
@ -275,44 +260,39 @@ class Pipeline:
# in the content store if they are both committed. However, after the call
# to commit all the trees will be based on the winner.
results["stages"] = []
try:
for stage in self.stages[base_idx + 1:]:
r = stage.run(tree.write(),
self.runner,
build_tree,
store,
interactive=interactive,
libdir=libdir,
var=store,
secrets=secrets)
if stage.checkpoint:
object_store.commit(tree, stage.id)
results["stages"].append(r.as_dict())
except BuildError as err:
results["stages"].append(err.as_dict())
results["success"] = False
return results
for stage in self.stages[base_idx + 1:]:
r = stage.run(tree.write(),
self.runner,
build_tree,
store,
interactive=interactive,
libdir=libdir,
var=store,
secrets=secrets)
if stage.checkpoint:
object_store.commit(tree, stage.id)
results["stages"].append(r.as_dict())
if not r.success:
results["success"] = False
return results
results["tree_id"] = self.tree_id
if self.assembler:
if not object_store.contains(self.output_id):
try:
with tree.read() as input_tree, \
object_store.new() as output_dir:
r = self.assembler.run(input_tree,
self.runner,
build_tree,
output_dir=output_dir.write(),
interactive=interactive,
libdir=libdir,
var=store)
results["assembler"] = r.as_dict()
object_store.commit(output_dir, self.output_id)
except BuildError as err:
results["assembler"] = err.as_dict()
results["success"] = False
return results
with tree.read() as input_tree, \
object_store.new() as output_dir:
r = self.assembler.run(input_tree,
self.runner,
build_tree,
output_dir=output_dir.write(),
interactive=interactive,
libdir=libdir,
var=store)
object_store.commit(output_dir, self.output_id)
results["assembler"] = r.as_dict()
if not r.success:
results["success"] = False
return results
results["output_id"] = self.output_id