testing/createhdds
11
0
Fork 0
mirror of https://github.com/rocky-linux/createhdds.git synced 2024-12-22 18:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move i686 F31+ filter, drop ppc64 F29+ one

Browse Source 
We previously did a filter like the one for 'i686 on F31+' for
'ppc64 on F29+', only in a different place which was actually a
better place. That filter is now unneeded as F28 went EOL, so
drop it...but move the i686 F31+ filter into the same place, as
it's better done there than in create().

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2019-11-05 12:40:02 -08:00
parent 8e6136ee20
commit c9da58b0b0
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
createhdds.py
View File

@ -226,11 +226,6 @@ class VirtInstallImage(object):
"intend to have %s workers you will need to run createhdds again on one " "intend to have %s workers you will need to run createhdds again on one "
"of them to create their base images", self.arch, CPUARCH, self.arch) "of them to create their base images", self.arch, CPUARCH, self.arch)
return return
if self.arch in ('i386', 'i686'):
if str(self.release).lower() == 'rawhide' or int(self.release) > 30:
# we just don't support this any more, since F31
logger.warning("Cannot create i686 images for releases after Fedora 30!")
return
# figure out the best os-variant. NOTE: libosinfo >= 0.3.1 # figure out the best os-variant. NOTE: libosinfo >= 0.3.1
# properly returns 1 on failure, but using workaround for old # properly returns 1 on failure, but using workaround for old
@ -493,10 +488,10 @@ def get_virtinstall_images(imggrp, nextrel=None, releases=None):
rels = [release] rels = [release]
for arch in arches: for arch in arches:
for rel in rels: for rel in rels:
# ppc64 was retired for f29; let's filter out all ppc64 # i686 images can't be created from f31 on; let's filter
# images for f29 and later. Once f28 is EOL we can just # out all i686 images for f31 and later. Once f30 is EOL
# ditch them from hdds.json and remove this # we can just ditch them from hdds.json and remove this
if arch == 'ppc64' and (rel == 'rawhide' or int(rel) > 28): if arch == 'i686' and (rel == 'rawhide' or int(rel) > 30):
continue continue
imgs.append( imgs.append(
VirtInstallImage(name, rel, arch, variant=variant, size=size, imgver=imgver, VirtInstallImage(name, rel, arch, variant=variant, size=size, imgver=imgver,