sig_core/toolkit
sig_core/toolkit
7
2
Fork 3
Code Issues 6 Pull Requests 2 Actions Projects Releases Wiki Activity

revert to stg url now that CDN is fixed. add in some additional metadata for builds and cleanup output for containers

Browse Source
This commit is contained in:
Neil Hanlon 2022-07-11 21:15:31 -04:00
parent 6b236b7b5f
commit 20bf0812db
Signed by: neil
GPG Key ID: 705BC21EC3C70F34
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,7 +96,8 @@ class ImageBuild:
# Yes, this is gross. I'll fix it later. # Yes, this is gross. I'll fix it later.
if self.image_type in ["Container"]: if self.image_type in ["Container"]:
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"] ["tar", "-C", f"{self.outdir}", "--strip-components=1", "-x", "-f", lambda: f"{STORAGE_DIR}/{self.target_uuid}.body", "*/layer.tar"],
["xz", f"{self.outdir}/layer.tar"]
] ]
if self.image_type in ["GenericCloud"]: if self.image_type in ["GenericCloud"]:
self.stage_commands = [ self.stage_commands = [
@ -124,6 +125,9 @@ class ImageBuild:
] ]
if self.stage_commands:
self.stage_commands += ["cp", "-v", lambda: f"{STORAGE_DIR}/{self.target_uuid}.meta", f"{self.outdir}/build.meta"]
try: try:
os.mkdir(self.outdir) os.mkdir(self.outdir)
except FileExistsError as e: except FileExistsError as e:

2
iso/empanadas/empanadas/templates/icicle/tdl.xml.tmpl
View File

@ -5,7 +5,7 @@
<version>{{minor}}</version> <version>{{minor}}</version>
<arch>{{architecture}}</arch> <arch>{{architecture}}</arch>
<install type='url'> <install type='url'>
<url>https://download.rockylinux.org/pub/rocky/{{major}}/BaseOS/{{architecture}}/{{installdir}}</url> <url>https://download.rockylinux.org/stg/rocky/{{major}}/BaseOS/{{architecture}}/{{installdir}}</url>
</install> </install>
<icicle> <icicle>
<extra_command>rpm -qa --qf '%{NAME},%{VERSION},%{RELEASE},%{ARCH},%{EPOCH},%{SIZE},%{SIGMD5},%{BUILDTIME}\n'</extra_command> <extra_command>rpm -qa --qf '%{NAME},%{VERSION},%{RELEASE},%{ARCH},%{EPOCH},%{SIZE},%{SIGMD5},%{BUILDTIME}\n'</extra_command>