sig_core
/
toolkit
7
2
Fork 1
Code Issues 5 Pull Requests Actions Projects Releases Wiki Activity

fix template for iso build

This commit is contained in:
Louis Abel 2022-06-26 22:05:24 -07:00
parent 37c0be3fd0
commit 28facef12c
Signed by: label
GPG Key ID: B37E62D143879B36
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
iso/empanadas/empanadas/scripts/sync_from_peridot.py
View File

@ -6,15 +6,11 @@ from empanadas.common import *
from empanadas.util import Checks from empanadas.util import Checks
from empanadas.util import RepoSync from empanadas.util import RepoSync
#rlvars = rldict['9']
#r = Checks(rlvars, config['arch'])
#r.check_valid_arch()
# Start up the parser baby # Start up the parser baby
parser = argparse.ArgumentParser(description="Peridot Sync and Compose") parser = argparse.ArgumentParser(description="Peridot Sync and Compose")
# All of our options # All of our options
parser.add_argument('--release', type=str, help="Major Release Version", required=True) parser.add_argument('--release', type=str, help="Major Release Version or major-type (eg 9-beta)", required=True)
parser.add_argument('--repo', type=str, help="Repository name") parser.add_argument('--repo', type=str, help="Repository name")
parser.add_argument('--arch', type=str, help="Architecture") parser.add_argument('--arch', type=str, help="Architecture")
parser.add_argument('--ignore-debug', action='store_true') parser.add_argument('--ignore-debug', action='store_true')
@ -41,7 +37,7 @@ r.check_valid_arch()
a = RepoSync( a = RepoSync(
rlvars, rlvars,
config, config,
major=results.release, major=rlvars['major'],
repo=results.repo, repo=results.repo,
arch=results.arch, arch=results.arch,
ignore_debug=results.ignore_debug, ignore_debug=results.ignore_debug,

2
iso/empanadas/empanadas/templates/extraisobuild.tmpl.sh
View File

@ -9,7 +9,7 @@ MOCK_ROOT="/var/lib/mock/{{ shortname|lower }}-{{ major }}-{{ arch }}"
MOCK_RESL="${MOCK_ROOT}/result" MOCK_RESL="${MOCK_ROOT}/result"
MOCK_CHRO="${MOCK_ROOT}/root" MOCK_CHRO="${MOCK_ROOT}/root"
MOCK_LOG="${MOCK_RESL}/mock-output.log" MOCK_LOG="${MOCK_RESL}/mock-output.log"
IMAGE_SCR="{{ entries_dir }}/buildExtraImage.sh" IMAGE_SCR="{{ entries_dir }}/buildExtraImage-{{ arch }}-{{ image }}.sh"
IMAGE_ISO="{{ isoname }}" IMAGE_ISO="{{ isoname }}"
ISOLATION="{{ isolation }}" ISOLATION="{{ isolation }}"
BUILDDIR="{{ builddir }}" BUILDDIR="{{ builddir }}"

13
iso/empanadas/empanadas/util/iso_utils.py
View File

@ -439,6 +439,12 @@ class IsoBuild:
) )
self._treeinfo_wrapper(arch, variant) self._treeinfo_wrapper(arch, variant)
# Do a dirsync for non-disc data
if not self.iso_map['images'][variant]['disc']:
self.log.info(
'Syncing repo data and images for %s%s%s' % (Color.BOLD, variant, Color.END)
)
self._copy_nondisc_to_repo(self.force_unpack, arch, variant)
def _s3_determine_latest(self): def _s3_determine_latest(self):
@ -684,6 +690,12 @@ class IsoBuild:
c.write(checksum) c.write(checksum)
c.close() c.close()
def _copy_nondisc_to_repo(self, force_unpack, arch, repo):
"""
Syncs data from a non-disc set of images to the appropriate repo. Repo
and image MUST match names for this to work.
"""
def run_boot_sync(self): def run_boot_sync(self):
""" """
This unpacks into BaseOS/$arch/os, assuming there's no data actually This unpacks into BaseOS/$arch/os, assuming there's no data actually
@ -989,6 +1001,7 @@ class IsoBuild:
shortname=self.shortname, shortname=self.shortname,
isoname=isoname, isoname=isoname,
entries_dir=entries_dir, entries_dir=entries_dir,
image=image,
) )
opts = { opts = {