add root_prefix requirement for shared func

rocky-linux · May 5, 2024 · 441eaa7 · 441eaa7
1 parent 439f1f7
commit 441eaa7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/iso/empanadas/empanadas/util/iso_utils.py b/iso/empanadas/empanadas/util/iso_utils.py
@@ -360,6 +360,7 @@ def run_pull_lorax_artifacts(self):
                     self.arches,
                     'tar.gz',
                     'lorax',
+                    'buildiso',
                     self.log
             )
         else:
@@ -1359,6 +1360,7 @@ def run_pull_generic_images(self):
                             arches_to_unpack,
                             formattype,
                             variantname,
+                            'buildimage',
                             self.log
                     )
 

diff --git a/iso/empanadas/empanadas/util/shared.py b/iso/empanadas/empanadas/util/shared.py
@@ -607,7 +607,8 @@ def rsync_method(src, dest):
 
     # pylint: disable=too-many-locals,too-many-arguments
     @staticmethod
-    def s3_determine_latest(s3_bucket, release, arches, filetype, name, logger):
+    def s3_determine_latest(s3_bucket, release, arches, filetype, name,
+                            root_prefix, logger):
         """
         Using native s3, determine the latest artifacts and return a dict
         """
@@ -640,8 +641,9 @@ def s3_determine_latest(s3_bucket, release, arches, filetype, name, logger):
 
         for arch in arches:
             temps = []
+            start_of_path = f'{root_prefix}-{release.split('.')[0]}-{arch}'
             for y in temp:
-                if arch in y:
+                if arch in y and start_of_path in y:
                     temps.append(y)
             temps.sort(reverse=True)
             if len(temps) > 0: