Allow specifying multiple Stampede2 queues in alloc_Stampede2_queue

Also prefer alloc_Stampede2_queues (plural) now that it's a stringlist; keep the old name for backward compat.

Author: matyasselmeci

flock.opensciencegrid.org/frontend-template.xml

@@ -1127,14 +1127,14 @@
          <match
              policy_file="/opt/git/flock.opensciencegrid.org/topology_match_policy.py"
              match_expr="True"
-             start_expr='(OSG_PROJECT_RESTRICTION) &amp;&amp; (isString(TARGET.Desired_Allocations) &amp;&amp; stringListIMember("Stampede2", TARGET.Desired_Allocations)) &amp;&amp; (TARGET.ITB_Sites =!= True) &amp;&amp; ((TARGET.alloc_Stampede2_queue ?: "normal") =?= "normal")'>
-            <factory query_expr='FactoryType == "production" &amp;&amp; stringListMember("OSG_UTAustin_Zimmerman", GLIDEIN_Supported_VOs) &amp;&amp; ((GLIDEIN_BatchQueue ?: "normal") =?= "normal")'>
+             start_expr='(OSG_PROJECT_RESTRICTION) &amp;&amp; (isString(TARGET.Desired_Allocations) &amp;&amp; stringListIMember("Stampede2", TARGET.Desired_Allocations)) &amp;&amp; (TARGET.ITB_Sites =!= True) &amp;&amp; (stringListIMember("normal", (TARGET.alloc_Stampede2_queues ?: (TARGET.alloc_Stampede2_queue ?: "normal"))))'>
+            <factory query_expr='FactoryType == "production" &amp;&amp; stringListMember("OSG_UTAustin_Zimmerman", GLIDEIN_Supported_VOs) &amp;&amp; ((GLIDEIN_BatchQueue ?: "normal") == "normal")'>
                <match_attrs>
                </match_attrs>
                <collectors>
                </collectors>
             </factory>
-            <job query_expr='(projectName=?="UTAustin_Zimmerman") &amp;&amp; (isString(Desired_Allocations) &amp;&amp; stringListIMember("Stampede2", Desired_Allocations)) &amp;&amp; (isUndefined(RequestGPUs) || RequestGPUs == 0) &amp;&amp; ((alloc_Stampede2_queue ?: "normal") =?= "normal")'>
+            <job query_expr='(projectName=?="UTAustin_Zimmerman") &amp;&amp; (isString(Desired_Allocations) &amp;&amp; stringListIMember("Stampede2", Desired_Allocations)) &amp;&amp; (isUndefined(RequestGPUs) || RequestGPUs == 0) &amp;&amp; (stringListIMember("normal", (alloc_Stampede2_queues ?: (alloc_Stampede2_queue ?: "normal"))))'>
                <match_attrs>
                </match_attrs>
                <schedds>
@@ -1190,14 +1190,14 @@
          <match
              policy_file="/opt/git/flock.opensciencegrid.org/topology_match_policy.py"
              match_expr="True"
-             start_expr='(OSG_PROJECT_RESTRICTION) &amp;&amp; (isString(TARGET.Desired_Allocations) &amp;&amp; stringListIMember("Stampede2", TARGET.Desired_Allocations)) &amp;&amp; (TARGET.ITB_Sites =!= True) &amp;&amp; ((TARGET.alloc_Stampede2_queue ?: "normal") =?= "skx-normal")'>
-            <factory query_expr='FactoryType == "production" &amp;&amp; stringListMember("OSG_UTAustin_Zimmerman", GLIDEIN_Supported_VOs) &amp;&amp; ((GLIDEIN_BatchQueue ?: "normal") =?= "skx-normal")'>
+             start_expr='(OSG_PROJECT_RESTRICTION) &amp;&amp; (isString(TARGET.Desired_Allocations) &amp;&amp; stringListIMember("Stampede2", TARGET.Desired_Allocations)) &amp;&amp; (TARGET.ITB_Sites =!= True) &amp;&amp; (stringListIMember("skx-normal", (TARGET.alloc_Stampede2_queues ?: (TARGET.alloc_Stampede2_queue ?: "normal"))))'>
+            <factory query_expr='FactoryType == "production" &amp;&amp; stringListMember("OSG_UTAustin_Zimmerman", GLIDEIN_Supported_VOs) &amp;&amp; ((GLIDEIN_BatchQueue ?: "normal") == "skx-normal")'>
                <match_attrs>
                </match_attrs>
                <collectors>
                </collectors>
             </factory>
-            <job query_expr='(projectName=?="UTAustin_Zimmerman") &amp;&amp; (isString(Desired_Allocations) &amp;&amp; stringListIMember("Stampede2", Desired_Allocations)) &amp;&amp; (isUndefined(RequestGPUs) || RequestGPUs == 0) &amp;&amp; ((alloc_Stampede2_queue ?: "normal") =?= "skx-normal")'>
+            <job query_expr='(projectName=?="UTAustin_Zimmerman") &amp;&amp; (isString(Desired_Allocations) &amp;&amp; stringListIMember("Stampede2", Desired_Allocations)) &amp;&amp; (isUndefined(RequestGPUs) || RequestGPUs == 0) &amp;&amp; (stringListIMember("skx-normal", (alloc_Stampede2_queues ?: (alloc_Stampede2_queue ?: "normal"))))'>
                <match_attrs>
                </match_attrs>
                <schedds>