Merge pull request #11088 from amaltaro/fix-11081-take2

Enhance logic to map ScramArch to OS
dmwm · Apr 12, 2022 · 73fa2c9 · 73fa2c9
2 parents 9bad6a8 + dacc5b9
commit 73fa2c9
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 20 deletions.
diff --git a/src/python/WMCore/BossAir/Plugins/BasePlugin.py b/src/python/WMCore/BossAir/Plugins/BasePlugin.py
@@ -6,7 +6,7 @@
 """
 
 from builtins import object, str, bytes
-from future.utils import viewitems, viewvalues
+from future.utils import viewvalues
 
 from Utils.Utilities import decodeBytesToUnicode
 from WMCore.WMException import WMException
@@ -130,27 +130,25 @@ def updateSiteInformation(self, jobs, siteName, excludeSite):
     @staticmethod
     def scramArchtoRequiredOS(scramArch=None):
         """
+        Matches a ScramArch - or a list of it - against a map of Scram
+        to Operating System
 
-        Args:
-            scramArch: string or list of scramArches that are acceptable for the job
-
-        Returns:
-            string to be matched for OS requirements for job
+        :param scramArch: string or list of scramArches defined for a given job
+        :return: a string with the required OS to use
         """
-        requiredOSes = set()
+        defaultValue = 'any'
         if not scramArch:
-            requiredOSes.add('any')
-        elif isinstance(scramArch, (str, bytes)):
-            for arch, validOSes in viewitems(ARCH_TO_OS):
-                if arch in scramArch:
-                    requiredOSes.update(validOSes)
-        elif isinstance(scramArch, list):
-            for validArch in scramArch:
-                for arch, validOSes in viewitems(ARCH_TO_OS):
-                    if arch in validArch:
-                        requiredOSes.update(validOSes)
-        else:
-            requiredOSes.add('any')
+            return defaultValue
+
+        requiredOSes = set()
+        if isinstance(scramArch, (str, bytes)):
+            scramArch = [scramArch]
+        elif not isinstance(scramArch, (list, tuple)):
+            return defaultValue
+
+        for validArch in scramArch:
+            scramOS = validArch.split("_")[0]
+            requiredOSes.update(ARCH_TO_OS.get(scramOS, []))
 
         return ','.join(sorted(requiredOSes))
 

diff --git a/test/python/WMCore_t/BossAir_t/BasePlugin_t.py b/test/python/WMCore_t/BossAir_t/BasePlugin_t.py
@@ -36,14 +36,17 @@ def testScramArchToOS(self):
         self.assertEqual(bp.scramArchtoRequiredOS('cc8_blah_blah'), 'rhel8')
         self.assertEqual(bp.scramArchtoRequiredOS('cs8_blah_blah'), 'rhel8')
         self.assertEqual(bp.scramArchtoRequiredOS('alma8_blah_blah'), 'rhel8')
-        self.assertEqual(bp.scramArchtoRequiredOS('el88_blah_blah'), 'rhel8')
+        self.assertEqual(bp.scramArchtoRequiredOS('el8_blah_blah'), 'rhel8')
 
         self.assertEqual(bp.scramArchtoRequiredOS(None), 'any')
         self.assertEqual(bp.scramArchtoRequiredOS(""), 'any')
         self.assertEqual(bp.scramArchtoRequiredOS([]), 'any')
 
         self.assertEqual(bp.scramArchtoRequiredOS(['slc6_blah_blah', 'slc7_blah_blah']), 'rhel6,rhel7')
+        self.assertEqual(bp.scramArchtoRequiredOS(['slc6_blah_blah', 'alma8_blah_blah']), 'rhel6,rhel8')
 
+        # unexpected case, a ScramArch being requested without the map implemented
+        self.assertEqual(bp.scramArchtoRequiredOS('slc1_blah_blah'), '')
         return
 
     def testScramArchtoRequiredArch(self):