use translators

rocky-linux · May 5, 2024 · 17d8fd7 · 17d8fd7
1 parent 796e96e
commit 17d8fd7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/iso/empanadas/empanadas/util/iso_utils.py b/iso/empanadas/empanadas/util/iso_utils.py
@@ -118,6 +118,7 @@ def __init__(
         self.bugurl = rlvars['bugurl']
 
         self.extra_files = rlvars['extra_files']
+        self.translators = config['translators']
 
         self.container = config['container']
         if 'container' in rlvars and len(rlvars['container']) > 0:
@@ -361,6 +362,7 @@ def run_pull_lorax_artifacts(self):
                     'tar.gz',
                     'lorax',
                     'buildiso',
+                    self.translators,
                     self.log
             )
         else:
@@ -1361,6 +1363,7 @@ def run_pull_generic_images(self):
                             formattype,
                             variantname,
                             'buildimage',
+                            self.translators,
                             self.log
                     )
 

diff --git a/iso/empanadas/empanadas/util/shared.py b/iso/empanadas/empanadas/util/shared.py
@@ -608,7 +608,7 @@ def rsync_method(src, dest):
     # pylint: disable=too-many-locals,too-many-arguments
     @staticmethod
     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
         """
@@ -641,9 +641,13 @@ def s3_determine_latest(s3_bucket, release, arches, filetype, name,
 
         for arch in arches:
             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:
-                if arch in y and start_of_path in y:
+                if arch in y and y.startswith(start_of_path):
                     temps.append(y)
             temps.sort(reverse=True)
             if len(temps) > 0: