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

add OCP to the necessary locations

Browse Source
This commit is contained in:
Neil Hanlon 2022-10-11 20:39:50 -04:00
parent 5a2c16ff28
commit fb37eb1bbc
Signed by untrusted user: neil
GPG Key ID: 705BC21EC3C70F34
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,6 +95,8 @@ class ImageBuild:
self.metadata = pathlib.Path(self.outdir, "metadata.json") self.metadata = pathlib.Path(self.outdir, "metadata.json")
self.kickstart_path = pathlib.Path(f"{KICKSTART_PATH}/Rocky-{self.architecture.major}-{self.type_variant}.ks")
self.checkout_kickstarts() self.checkout_kickstarts()
self.kickstart_arg = self.kickstart_imagefactory_args() self.kickstart_arg = self.kickstart_imagefactory_args()
@ -196,7 +198,7 @@ class ImageBuild:
args = [] args = []
if self.image_type == "Container": if self.image_type == "Container":
args = ["--parameter", "offline_icicle", "true"] args = ["--parameter", "offline_icicle", "true"]
if self.image_type in ["GenericCloud", "EC2", "Vagrant", "Azure"]: if self.image_type in ["GenericCloud", "EC2", "Vagrant", "Azure", "OCP"]:
args = ["--parameter", "generate_icicle", "false"] args = ["--parameter", "generate_icicle", "false"]
return args return args
@ -207,15 +209,14 @@ class ImageBuild:
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 ''
def kickstart_imagefactory_args(self) -> List[str]: def kickstart_imagefactory_args(self) -> List[str]:
kickstart_path = pathlib.Path(f"{KICKSTART_PATH}/Rocky-{self.architecture.major}-{self.type_variant}.ks")
if not kickstart_path.is_file(): if not self.kickstart_path.is_file():
log.warn(f"Kickstart file is not available: {kickstart_path}") log.warn(f"Kickstart file is not available: {self.kickstart_path}")
if not debug: if not debug:
log.warn("Exiting because debug mode is not enabled.") log.warn("Exiting because debug mode is not enabled.")
exit(2) exit(2)
return ["--file-parameter", "install_script", str(kickstart_path)] return ["--file-parameter", "install_script", str(self.kickstart_path)]
def render_icicle_template(self) -> pathlib.Path: def render_icicle_template(self) -> pathlib.Path:
handle, output = tempfile.mkstemp() handle, output = tempfile.mkstemp()
@ -376,7 +377,8 @@ class ImageBuild:
log_lines("Command STDERR", stderr) log_lines("Command STDERR", stderr)
def fix_ks(self): def fix_ks(self):
self.runCmd(["sed", "-i", f"s,$basearch,{self.architecture.name},", self.kickstart_arg[-1]], search=False) cmd: CMD_PARAM_T = ["sed", "-i", f"s,$basearch,{self.architecture.name},", str(self.kickstart_path)]
self.runCmd(cmd, search=False)
def render_kubernetes_job(self): def render_kubernetes_job(self):
commands = [self.build_command(), self.package_command(), self.copy_command()] commands = [self.build_command(), self.package_command(), self.copy_command()]