remove minimal as an image for now

This commit is contained in:
Louis Abel 2022-06-20 20:27:30 -07:00
parent 6914d651c4
commit a28bed653a
Signed by: label
GPG Key ID: B37E62D143879B36
4 changed files with 13 additions and 7 deletions

View File

@ -55,7 +55,6 @@
s390x: '' s390x: ''
images: images:
- dvd - dvd
- minimal
lorax_variants: lorax_variants:
- dvd - dvd
- minimal - minimal

View File

@ -55,7 +55,6 @@
s390x: '' s390x: ''
images: images:
- dvd - dvd
- minimal
lorax_variants: lorax_variants:
- dvd - dvd
- minimal - minimal

View File

@ -55,7 +55,6 @@
s390x: '' s390x: ''
images: images:
- dvd - dvd
- minimal
lorax_variants: lorax_variants:
- dvd - dvd
- minimal - minimal

View File

@ -461,7 +461,7 @@ class IsoBuild:
) )
return return
self.log.info('Downloading to: %s' % dest) self.log.info('Downloading ({}) to: {}'.format(source, dest))
try: try:
self.s3.download_file( self.s3.download_file(
Bucket=self.s3_bucket, Bucket=self.s3_bucket,
@ -513,7 +513,7 @@ class IsoBuild:
return return
unurl = self.s3_bucket_url + '/' + source unurl = self.s3_bucket_url + '/' + source
self.log.info('Downloading to: %s' % dest) self.log.info('Downloading ({}) to: {}'.format(source, dest))
try: try:
with requests.get(unurl, allow_redirects=True) as r: with requests.get(unurl, allow_redirects=True) as r:
with open(dest, 'wb') as f: with open(dest, 'wb') as f:
@ -581,6 +581,15 @@ class IsoBuild:
except: except:
self.log.error('%s already exists??' % image) self.log.error('%s already exists??' % image)
self.log.info('Removing boot.iso from copy')
try:
os.remove(path_to_image + '/images/boot.iso')
except:
self.log.error(
'[' + Color.BOLD + Color.YELLOW + 'FAIL' + Color.END + '] ' +
'Cannot remove boot.iso'
)
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
@ -615,11 +624,11 @@ class IsoBuild:
""" """
self.log.info('Starting treeinfo work...') self.log.info('Starting treeinfo work...')
def _treeinfo_from_lorax(self, arch, force_unpack): def _treeinfo_from_lorax(self, arch, force_unpack, variant):
""" """
Fixes lorax treeinfo Fixes lorax treeinfo
""" """
self.log.info('Fixing up lorax treeinfo for %s ...' % ) self.log.info('Fixing up lorax treeinfo for %s ...' % variant)
def discinfo_write(self): def discinfo_write(self):
""" """