sshtepa/toolkit
1
0
Fork 0
forked from sig_core/toolkit
Code Pull Requests Activity

use translators

Browse Source
This commit is contained in:
Louis Abel 2024-05-04 18:30:35 -07:00
parent 796e96ed95
commit 17d8fd7f23
Signed by untrusted user: label
GPG Key ID: 2A6975660E424560
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,6 +118,7 @@ class IsoBuild:
self.bugurl = rlvars['bugurl'] self.bugurl = rlvars['bugurl']
self.extra_files = rlvars['extra_files'] self.extra_files = rlvars['extra_files']
self.translators = config['translators']
self.container = config['container'] self.container = config['container']
if 'container' in rlvars and len(rlvars['container']) > 0: if 'container' in rlvars and len(rlvars['container']) > 0:
@ -361,6 +362,7 @@ class IsoBuild:
'tar.gz', 'tar.gz',
'lorax', 'lorax',
'buildiso', 'buildiso',
self.translators,
self.log self.log
) )
else: else:
@ -1361,6 +1363,7 @@ class IsoBuild:
formattype, formattype,
variantname, variantname,
'buildimage', 'buildimage',
self.translators,
self.log self.log
) )

10
iso/empanadas/empanadas/util/shared.py
View File

@ -608,7 +608,7 @@ class Shared:
# pylint: disable=too-many-locals,too-many-arguments # pylint: disable=too-many-locals,too-many-arguments
@staticmethod @staticmethod
def s3_determine_latest(s3_bucket, release, arches, filetype, name, def s3_determine_latest(s3_bucket, release, arches, filetype, name,
root_prefix, logger): root_prefix, translators, logger):
""" """
Using native s3, determine the latest artifacts and return a dict Using native s3, determine the latest artifacts and return a dict
""" """
@ -641,9 +641,13 @@ class Shared:
for arch in arches: for arch in arches:
temps = [] temps = []
start_of_path = f"{root_prefix}-{release.split('.')[0]}-{arch}" new_arch = arch
# This is lazy, but...
if root_prefix == 'buildiso':
new_arch = translators[arch]
start_of_path = f"{root_prefix}-{release.split('.')[0]}-{new_arch}"
for y in temp: for y in temp:
if arch in y and start_of_path in y: if arch in y and y.startswith(start_of_path):
temps.append(y) temps.append(y)
temps.sort(reverse=True) temps.sort(reverse=True)
if len(temps) > 0: if len(temps) > 0: