diff --git a/factory/tools/OSG_autoconf.py b/factory/tools/OSG_autoconf.py index 1b83f39b3..e3e149c64 100644 --- a/factory/tools/OSG_autoconf.py +++ b/factory/tools/OSG_autoconf.py @@ -149,7 +149,7 @@ def get_entry_dictionary(resource, vos, cpus, walltime, memory): if resource: edict["attrs"]["GLIDEIN_ResourceName"] = {"value": resource} if len(vos) > 0: - edict["attrs"]["GLIDEIN_Supported_VOs"] = {"value": ",".join(vos)} + edict["attrs"]["GLIDEIN_Supported_VOs"] = {"value": ",".join(sorted(vos))} edict["submit_attrs"] = {} if cpus != None: edict["attrs"]["GLIDEIN_CPUS"] = {"value": cpus} diff --git a/unittests/test_OSG_autoconf.py b/unittests/test_OSG_autoconf.py index 89a12a5ed..8566bfe93 100755 --- a/unittests/test_OSG_autoconf.py +++ b/unittests/test_OSG_autoconf.py @@ -208,7 +208,7 @@ def test_get_information_internal(self): "GLIDEIN_MaxMemMBs": {"value": 32768}, "GLIDEIN_Max_Walltime": {"value": 84600}, "GLIDEIN_CPUS": {"value": 8}, - "GLIDEIN_Supported_VOs": {"value": "osg,cms"}, + "GLIDEIN_Supported_VOs": {"value": "cms,osg"}, "GLIDEIN_REQUIRED_OS": {"value": "rhel6"}, }, "submit_attrs": {"+maxWallTime": 1440, "+xcount": 8, "+maxMemory": 32768},