add next phase before sign off

This commit is contained in:
Louis Abel 2022-06-20 01:34:10 -07:00
parent 72f98dcdb6
commit 22f920042e
Signed by: label
GPG Key ID: B37E62D143879B36
6 changed files with 63 additions and 14 deletions

View File

@ -54,9 +54,8 @@
ppc64le: '' ppc64le: ''
s390x: '' s390x: ''
images: images:
- dvd1 - dvd
- minimal - minimal
- boot
repos: repos:
- 'BaseOS' - 'BaseOS'
- 'AppStream' - 'AppStream'

View File

@ -54,9 +54,8 @@
ppc64le: '' ppc64le: ''
s390x: '' s390x: ''
images: images:
- dvd1 - dvd
- minimal - minimal
- boot
repos: repos:
- 'BaseOS' - 'BaseOS'
- 'AppStream' - 'AppStream'

View File

@ -54,9 +54,8 @@
ppc64le: '' ppc64le: ''
s390x: '' s390x: ''
images: images:
- dvd1 - dvd
- minimal - minimal
- boot
repos: repos:
- 'BaseOS' - 'BaseOS'
- 'AppStream' - 'AppStream'

View File

@ -10,6 +10,7 @@ parser = argparse.ArgumentParser(description="ISO Artifact Builder")
parser.add_argument('--release', type=str, help="Major Release Version", required=True) parser.add_argument('--release', type=str, help="Major Release Version", required=True)
parser.add_argument('--s3', action='store_true', help="Release Candidate") parser.add_argument('--s3', action='store_true', help="Release Candidate")
parser.add_argument('--rc', action='store_true', help="Release Candidate")
parser.add_argument('--arch', type=str, help="Architecture") parser.add_argument('--arch', type=str, help="Architecture")
parser.add_argument('--local-compose', action='store_true', help="Compose Directory is Here") parser.add_argument('--local-compose', action='store_true', help="Compose Directory is Here")
parser.add_argument('--force-unpack', action='store_true', help="Force an unpack") parser.add_argument('--force-unpack', action='store_true', help="Force an unpack")
@ -23,6 +24,7 @@ a = IsoBuild(
rlvars, rlvars,
config, config,
major=major, major=major,
rc=results.rc,
s3=results.s3, s3=results.s3,
arch=results.arch, arch=results.arch,
force_unpack=results.force_unpack, force_unpack=results.force_unpack,

View File

@ -12,6 +12,7 @@ import subprocess
import shlex import shlex
import time import time
import tarfile import tarfile
import shutil
# lazy person's s3 parser # lazy person's s3 parser
import requests import requests
@ -396,10 +397,32 @@ class IsoBuild:
'[' + Color.BOLD + Color.GREEN + 'INFO' + Color.END + '] ' + '[' + Color.BOLD + Color.GREEN + 'INFO' + Color.END + '] ' +
'Unpack phase completed' 'Unpack phase completed'
) )
self.log.info(
'[' + Color.BOLD + Color.GREEN + 'INFO' + Color.END + '] ' +
'Beginning image variant phase'
)
for arch in arches_to_unpack:
self.log.info(
'Copying base lorax for ' + Color.BOLD + arch + Color.END
)
for variant in self.iso_map['images']:
self._copy_lorax_to_variant(self.force_unpack, arch, variant)
self.log.info(
'[' + Color.BOLD + Color.GREEN + 'INFO' + Color.END + '] ' +
'Image variant phase completed'
)
self.log.info(
'[' + Color.BOLD + Color.GREEN + 'INFO' + Color.END + '] ' +
'Beginning treeinfo phase'
)
def _s3_determine_latest(self): def _s3_determine_latest(self):
""" """
Using native s3, determine the latest artifacts and return a list Using native s3, determine the latest artifacts and return a dict
""" """
temp = [] temp = []
data = {} data = {}
@ -520,11 +543,40 @@ class IsoBuild:
t.extractall(unpack_dir) t.extractall(unpack_dir)
t.close() t.close()
def _copy_lorax_to_variant(self, force_unpack, arch): def _copy_lorax_to_variant(self, force_unpack, arch, image):
""" """
Copy to variants for easy access of mkiso and copying to compose dirs Copy to variants for easy access of mkiso and copying to compose dirs
""" """
print() src_to_image = os.path.join(
self.lorax_work_dir,
arch,
'lorax'
)
if not os.path.exists(os.path.join(src_to_image, '.treeinfo')):
self.log.error(
'[' + Color.BOLD + Color.RED + 'FAIL' + Color.END + '] ' +
'Lorax base image does not exist'
)
return
path_to_image = os.path.join(
self.lorax_work_dir,
arch,
image
)
if not force_unpack:
file_check = os.path.join(path_to_image, '.treeinfo')
if os.path.exists(file_check):
self.log.warn(
'[' + Color.BOLD + Color.YELLOW + 'WARN' + Color.END + '] ' +
'Lorax image for ' + image + ' already exists'
)
return
self.log.info('Copying base lorax to %s directory...' % image)
shutil.copytree(src_to_image, path_to_image)
def run_boot_sync(self): def run_boot_sync(self):
""" """
@ -547,13 +599,11 @@ class IsoBuild:
self.sync_boot(force_unpack=self.force_unpack, arch=self.arch) self.sync_boot(force_unpack=self.force_unpack, arch=self.arch)
self.treeinfo_write(arch=self.arch) self.treeinfo_write(arch=self.arch)
def sync_boot(self, force_unpack, arch): def _sync_boot(self, force_unpack, arch, variant):
""" """
Syncs whatever Syncs whatever
""" """
self.log.info('Syncing lorax to dvd directory...') self.log.info('Copying lorax to %s directory...' % variant)
# checks here, report that it already exists
self.log.info('Syncing lorax to %s directory...' % self.iso_map['variant'])
# checks here, report that it already exists # checks here, report that it already exists
def treeinfo_write(self, arch): def treeinfo_write(self, arch):

View File

@ -24,7 +24,7 @@ sync_from_peridot = "empanadas.scripts.sync_from_peridot:run"
sync_from_peridot_test = "empanadas.scripts.sync_from_peridot_test:run" sync_from_peridot_test = "empanadas.scripts.sync_from_peridot_test:run"
sync_sig = "empanadas.scripts.sync_sig:run" sync_sig = "empanadas.scripts.sync_sig:run"
build-iso = "empanadas.scripts.build_iso:run" build-iso = "empanadas.scripts.build_iso:run"
pull-unpack-artifact = "empanadas.scripts.pull_unpack_artifact:run" pull-unpack-tree = "empanadas.scripts.pull_unpack_tree:run"
[build-system] [build-system]
requires = ["poetry-core>=1.0.0"] requires = ["poetry-core>=1.0.0"]