sshtepa/toolkit
1
0
Fork 0
forked from sig_core/toolkit
Code Pull Requests Activity

better implementation of timeout argument

Browse Source
This commit is contained in:
Neil Hanlon 2022-11-23 17:16:48 -05:00
parent 0fb7bf938e
commit 4de8ad7cdb
Signed by untrusted user: neil
GPG Key ID: 705BC21EC3C70F34
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -231,7 +231,7 @@ class ImageBuild:
def _command_args(self): def _command_args(self):
args_mapping = { args_mapping = {
"debug": "--debug" "debug": "--debug",
} }
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)]
@ -246,7 +246,6 @@ class ImageBuild:
args = ["--parameter", "offline_icicle", "true"] args = ["--parameter", "offline_icicle", "true"]
if self.image_type in ["GenericCloud", "EC2", "Vagrant", "Azure", "OCP", "RPI"]: if self.image_type in ["GenericCloud", "EC2", "Vagrant", "Azure", "OCP", "RPI"]:
args = ["--parameter", "generate_icicle", "false"] args = ["--parameter", "generate_icicle", "false"]
args.append(["--timeout", self.timeout])
return args return args
def image_format(self) -> str: def image_format(self) -> str:
@ -292,18 +291,13 @@ class ImageBuild:
) )
def build_command(self) -> List[str]: def build_command(self) -> List[str]:
build_command = ["imagefactory", *self.command_args, "base_image", *self.common_args, *self.kickstart_arg, self.tdl_path build_command = ["imagefactory", "--timeout", self.timeout, *self.command_args, "base_image", *self.common_args, *self.kickstart_arg, self.tdl_path]
# "|", "tee", "-a", f"{outdir}/logs/base_image-{outname}.out",
# "|", "tail", "-n4", ">", f"{outdir}/base.meta", "||", "exit", "2"
]
return build_command return build_command
def package_command(self) -> List[str]: def package_command(self) -> List[str]:
package_command = ["imagefactory", *self.command_args, "target_image", self.out_type, *self.common_args, package_command = ["imagefactory", *self.command_args, "target_image", self.out_type, *self.common_args,
"--id", f"{self.base_uuid}", "--id", f"{self.base_uuid}",
*self.package_args, *self.package_args,
"--parameter", "repository", self.outname, "--parameter", "repository", self.outname,
# "|", "tee", "-a", f"{outdir}/base_image-{outname}.out",
# "|", "tail", "-n4", ">", f"{outdir}/target.meta", "||", "exit", "3"
] ]
return package_command return package_command