lumarel/toolkit
1
0
Fork 0
forked from sig_core/toolkit
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RPI image needs to be an xz'd .raw

Browse Source
This commit is contained in:
Neil Hanlon 2022-11-19 13:21:50 -05:00
parent 435206c1ca
commit 09567eb82e
Signed by untrusted user: neil
GPG Key ID: 705BC21EC3C70F34
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
iso/empanadas/empanadas/scripts/build_image.py
View File

@ -109,8 +109,8 @@ class ImageBuild:
] ]
if self.image_type in ["RPI"]: if self.image_type in ["RPI"]:
self.stage_commands = [ self.stage_commands = [
["tar", "-C", f"{self.outdir}", "--strip-components=1", "-x", "-f", lambda: f"{STORAGE_DIR}/{self.target_uuid}.body", "*/layer.tar"], ["cp", lambda: f"{STORAGE_DIR}/{self.target_uuid}.body", f"{self.outdir}/{self.outname}.raw"],
["xz", f"{self.outdir}/layer.tar"] ["xz", f"{self.outdir}/{self.outname}.raw"]
] ]
if self.image_type in ["GenericCloud", "OCP"]: if self.image_type in ["GenericCloud", "OCP"]:
self.stage_commands = [ self.stage_commands = [
@ -197,22 +197,21 @@ class ImageBuild:
return [param for name, param in args_mapping.items() if getattr(self.cli_args, name)] return [param for name, param in args_mapping.items() if getattr(self.cli_args, name)]
def _package_args(self) -> List[str]: def _package_args(self) -> List[str]:
if self.image_type in ["Container", "RPI"]: if self.image_type in ["Container"]:
return ["--parameter", "compress", "xz"] return ["--parameter", "compress", "xz"]
return [""] return [""]
def _common_args(self) -> List[str]: def _common_args(self) -> List[str]:
args = [] args = []
if self.image_type in ["Container", "RPI"]: if self.image_type in ["Container"]:
args = ["--parameter", "offline_icicle", "true"] args = ["--parameter", "offline_icicle", "true"]
if self.image_type in ["GenericCloud", "EC2", "Vagrant", "Azure", "OCP"]: if self.image_type in ["GenericCloud", "EC2", "Vagrant", "Azure", "OCP", "RPI"]:
args = ["--parameter", "generate_icicle", "false"] args = ["--parameter", "generate_icicle", "false"]
return args return args
def image_format(self) -> str: def image_format(self) -> str:
mapping = { mapping = {
"Container": "docker", "Container": "docker"
"RPI": "docker"
} }
return mapping[self.image_type] if self.image_type in mapping.keys() else '' return mapping[self.image_type] if self.image_type in mapping.keys() else ''
@ -290,7 +289,7 @@ class ImageBuild:
def package(self) -> int: def package(self) -> int:
# Some build types don't need to be packaged by imagefactory # Some build types don't need to be packaged by imagefactory
# @TODO remove business logic if possible # @TODO remove business logic if possible
if self.image_type in ["GenericCloud", "EC2", "Azure", "Vagrant", "OCP"]: if self.image_type in ["GenericCloud", "EC2", "Azure", "Vagrant", "OCP", "RPI"]:
self.target_uuid = self.base_uuid if hasattr(self, 'base_uuid') else "" self.target_uuid = self.base_uuid if hasattr(self, 'base_uuid') else ""
if self.target_uuid: if self.target_uuid: