Add GPU requirements to hlt_gpu-group start expression.

compiled/cern/tier0/frontend.xml

@@ -350,7 +350,7 @@
             <running_glideins_per_entry max="10000" min="0" relative_to_queue="1.05"/>
             <running_glideins_total curb="100000" max="110000"/>
          </config>
-         <match match_expr='False' start_expr='(ifthenelse(DESIRED_Sites isnt undefined, stringListMember(GLIDEIN_CMSSite,DESIRED_Sites), undefined) || ifthenelse(DESIRED_Gatekeepers isnt undefined, stringListMember(GLIDEIN_Gatekeeper,DESIRED_Gatekeepers), undefined)) &amp;&amp; (GLIDEIN_CMSSite =!= "T2_CH_CERN_HLT" || WMAgent_AgentName =!= UNDEFINED)'>
+         <match match_expr='False' start_expr='(ifthenelse(DESIRED_Sites isnt undefined, stringListMember(GLIDEIN_CMSSite,DESIRED_Sites), undefined) || ifthenelse(DESIRED_Gatekeepers isnt undefined, stringListMember(GLIDEIN_Gatekeeper,DESIRED_Gatekeepers), undefined)) &amp;&amp; (GLIDEIN_CMSSite =!= "T2_CH_CERN_HLT" || WMAgent_AgentName =!= UNDEFINED) &amp;&amp; ((RequestGPUs =!= UNDEFINED &amp;&amp; RequestGPUs &gt; 0) || ((DynamicSlot =!= true) &amp;&amp; (isUndefined(RequestGPUs) || RequestGPUs==0) || GPUs==0))'>
             <factory query_expr='ENTRYNAME=="CMSHTPC_T2_CH_CERN_HLT_gpu"'>
                <match_attrs>
                   <match_attr name="GLIDEIN_CMSSite" type="string"/>

compiled/fnal/tier0/frontend.xml

@@ -351,7 +351,7 @@
             <running_glideins_per_entry max="10000" min="0" relative_to_queue="1.05"/>
             <running_glideins_total curb="100000" max="110000"/>
          </config>
-         <match match_expr='False' start_expr='(ifthenelse(DESIRED_Sites isnt undefined, stringListMember(GLIDEIN_CMSSite,DESIRED_Sites), undefined) || ifthenelse(DESIRED_Gatekeepers isnt undefined, stringListMember(GLIDEIN_Gatekeeper,DESIRED_Gatekeepers), undefined)) &amp;&amp; (GLIDEIN_CMSSite =!= "T2_CH_CERN_HLT" || WMAgent_AgentName =!= UNDEFINED)'>
+         <match match_expr='False' start_expr='(ifthenelse(DESIRED_Sites isnt undefined, stringListMember(GLIDEIN_CMSSite,DESIRED_Sites), undefined) || ifthenelse(DESIRED_Gatekeepers isnt undefined, stringListMember(GLIDEIN_Gatekeeper,DESIRED_Gatekeepers), undefined)) &amp;&amp; (GLIDEIN_CMSSite =!= "T2_CH_CERN_HLT" || WMAgent_AgentName =!= UNDEFINED) &amp;&amp; ((RequestGPUs =!= UNDEFINED &amp;&amp; RequestGPUs &gt; 0) || ((DynamicSlot =!= true) &amp;&amp; (isUndefined(RequestGPUs) || RequestGPUs==0) || GPUs==0))'>
             <factory query_expr='ENTRYNAME=="CMSHTPC_T2_CH_CERN_HLT_gpu"'>
                <match_attrs>
                   <match_attr name="GLIDEIN_CMSSite" type="string"/>

inventory/classes/tier0.yml

@@ -365,8 +365,7 @@ parameters:
       # 3) If the slot has no GPUs left (GPUs==0), the job starts immediately.
       # MM Temporarily remove the part of the expression due to issues with HLT. Need to debug this or find a better solution
       start_expr: >-
-        (ifthenelse(DESIRED_Sites isnt undefined, stringListMember(GLIDEIN_CMSSite,DESIRED_Sites), undefined) || ifthenelse(DESIRED_Gatekeepers isnt undefined, stringListMember(GLIDEIN_Gatekeeper,DESIRED_Gatekeepers), undefined)) && (GLIDEIN_CMSSite =!= "T2_CH_CERN_HLT" || WMAgent_AgentName =!= UNDEFINED)
-      # && ((RequestGPUs =!= UNDEFINED && RequestGPUs > 0) || ((DynamicSlot =!= true) && (CurrentTime - DaemonStartTime) > 1800 && (isUndefined(RequestGPUs) || RequestGPUs==0) || GPUs==0))
+        (ifthenelse(DESIRED_Sites isnt undefined, stringListMember(GLIDEIN_CMSSite,DESIRED_Sites), undefined) || ifthenelse(DESIRED_Gatekeepers isnt undefined, stringListMember(GLIDEIN_Gatekeeper,DESIRED_Gatekeepers), undefined)) && (GLIDEIN_CMSSite =!= "T2_CH_CERN_HLT" || WMAgent_AgentName =!= UNDEFINED) && ((RequestGPUs =!= UNDEFINED && RequestGPUs > 0) || ((DynamicSlot =!= true) && (isUndefined(RequestGPUs) || RequestGPUs==0) || GPUs==0))
       factory_query_expr: >-
         ENTRYNAME=="CMSHTPC_T2_CH_CERN_HLT_gpu"
       job_query_expr: 'False'