diff --git a/compiled/cern/global/frontend.xml b/compiled/cern/global/frontend.xml index 1221f7dd39805d85e4d9ee01d326f21784b8c80a..dbec589f6d68f6dabcd0275ba551030bf0c9c7e0 100644 --- a/compiled/cern/global/frontend.xml +++ b/compiled/cern/global/frontend.xml @@ -132,7 +132,7 @@ <attr name="GLIDEIN_OVERLOAD_ENABLED" glidein_publish="True" job_publish="True" parameter="True" type="expr" value="False"/> <attr name="PREFER_IPV4" glidein_publish="True" job_publish="False" parameter="False" type="expr" value="False"/> <attr name="CHIRP_DELAYED_UPDATE_MAX_ATTRS" glidein_publish="True" job_publish="True" parameter="True" type="int" value="200"/> - <attr name="CMS_MATCH_MICROARCH" glidein_publish="True" job_publish="True" parameter="True" type="expr" value="(Microarch is undefined || REQUIRED_MINIMUM_MICROARCH is undefined || REQUIRED_MINIMUM_MICROARCH<=int(substr(split(Microarch,"-")[1],1)))"/> + <attr name="CMS_MATCH_MICROARCH" glidein_publish="True" job_publish="True" parameter="True" type="expr" value="(Microarch is undefined || REQUIRED_MINIMUM_MICROARCH is undefined || REQUIRED_MINIMUM_MICROARCH<=int(substr(split(Microarch,"-")[1],1)))"/> <attr name="GLIDEIN_CLAIM_WORKLIFE_DYNAMIC" glidein_publish="True" job_publish="True" parameter="True" type="expr" value="cpus*(6*3600)"/> <attr name="OSG_SINGULARITY_BINARY" glidein_publish="True" job_publish="True" parameter="True" type="string" value="/cvmfs/oasis.opensciencegrid.org/mis/apptainer/1.2.5/bin/apptainer"/> </attrs> diff --git a/compiled/cern/itb/frontend.xml b/compiled/cern/itb/frontend.xml index 77336560125cacc0ffed119747f59a73082377c5..7bf785fa8afe2c1fcdee00c37e47b66eece62fe6 100644 --- a/compiled/cern/itb/frontend.xml +++ b/compiled/cern/itb/frontend.xml @@ -117,7 +117,7 @@ <attr name="GLIDEIN_OVERLOAD_ENABLED" glidein_publish="True" job_publish="True" parameter="True" type="expr" value="False"/> <attr name="PREFER_IPV4" glidein_publish="True" job_publish="False" parameter="False" type="expr" value="False"/> <attr name="CHIRP_DELAYED_UPDATE_MAX_ATTRS" glidein_publish="True" job_publish="True" parameter="True" type="int" value="200"/> - <attr name="CMS_MATCH_MICROARCH" glidein_publish="True" job_publish="True" parameter="True" type="expr" value="(Microarch is undefined || REQUIRED_MINIMUM_MICROARCH is undefined || REQUIRED_MINIMUM_MICROARCH<=int(substr(split(Microarch,"-")[1],1)))"/> + <attr name="CMS_MATCH_MICROARCH" glidein_publish="True" job_publish="True" parameter="True" type="expr" value="(Microarch is undefined || REQUIRED_MINIMUM_MICROARCH is undefined || REQUIRED_MINIMUM_MICROARCH<=int(substr(split(Microarch,"-")[1],1)))"/> <attr name="GLIDEIN_CLAIM_WORKLIFE_DYNAMIC" glidein_publish="True" job_publish="True" parameter="True" type="expr" value="cpus*(6*3600)"/> <attr name="GLIDEIN_DEBUG_OUTPUT" glidein_publish="True" job_publish="True" parameter="True" type="string" value="True"/> <attr name="GLIDEIN_DEBUG_OPTIONS" glidein_publish="True" job_publish="True" parameter="True" type="string" value="userjob"/> diff --git a/compiled/cern/itbdev/frontend.xml b/compiled/cern/itbdev/frontend.xml index 32912d22f6e1661ea33b125605a42f99bdfcb9bf..4da7c329802f8cac0bfe57d6674151b8ee9b48b4 100644 --- a/compiled/cern/itbdev/frontend.xml +++ b/compiled/cern/itbdev/frontend.xml @@ -84,7 +84,7 @@ <attr name="GLIDEIN_OVERLOAD_ENABLED" glidein_publish="True" job_publish="True" parameter="True" type="expr" value="False"/> <attr name="PREFER_IPV4" glidein_publish="True" job_publish="False" parameter="False" type="expr" value="False"/> <attr name="CHIRP_DELAYED_UPDATE_MAX_ATTRS" glidein_publish="True" job_publish="True" parameter="True" type="int" value="200"/> - <attr name="CMS_MATCH_MICROARCH" glidein_publish="True" job_publish="True" parameter="True" type="expr" value="(Microarch is undefined || REQUIRED_MINIMUM_MICROARCH is undefined || REQUIRED_MINIMUM_MICROARCH<=int(substr(split(Microarch,"-")[1],1)))"/> + <attr name="CMS_MATCH_MICROARCH" glidein_publish="True" job_publish="True" parameter="True" type="expr" value="(Microarch is undefined || REQUIRED_MINIMUM_MICROARCH is undefined || REQUIRED_MINIMUM_MICROARCH<=int(substr(split(Microarch,"-")[1],1)))"/> <attr name="GLIDEIN_CLAIM_WORKLIFE_DYNAMIC" glidein_publish="True" job_publish="True" parameter="True" type="expr" value="cpus*(6*3600)"/> <attr name="GLIDEIN_DEBUG_OUTPUT" glidein_publish="True" job_publish="True" parameter="True" type="string" value="True"/> <attr name="GLIDEIN_DEBUG_OPTIONS" glidein_publish="True" job_publish="True" parameter="True" type="string" value="userjob"/> diff --git a/compiled/cern/tier0/frontend.xml b/compiled/cern/tier0/frontend.xml index f5c9171752f1d893e8019aa77527621edb3e39c2..738321e488cfe959ba95ced70eb735d9e8bea67a 100644 --- a/compiled/cern/tier0/frontend.xml +++ b/compiled/cern/tier0/frontend.xml @@ -128,7 +128,7 @@ <attr name="GLIDEIN_OVERLOAD_ENABLED" glidein_publish="True" job_publish="True" parameter="True" type="expr" value="False"/> <attr name="PREFER_IPV4" glidein_publish="True" job_publish="False" parameter="False" type="expr" value="False"/> <attr name="CHIRP_DELAYED_UPDATE_MAX_ATTRS" glidein_publish="True" job_publish="True" parameter="True" type="int" value="200"/> - <attr name="CMS_MATCH_MICROARCH" glidein_publish="True" job_publish="True" parameter="True" type="expr" value="(Microarch is undefined || REQUIRED_MINIMUM_MICROARCH is undefined || REQUIRED_MINIMUM_MICROARCH<=int(substr(split(Microarch,"-")[1],1)))"/> + <attr name="CMS_MATCH_MICROARCH" glidein_publish="True" job_publish="True" parameter="True" type="expr" value="(Microarch is undefined || REQUIRED_MINIMUM_MICROARCH is undefined || REQUIRED_MINIMUM_MICROARCH<=int(substr(split(Microarch,"-")[1],1)))"/> <attr name="GLIDECLIENT_Rank" glidein_publish="True" job_publish="True" parameter="True" type="string" value="1"/> <attr name="GLIDEIN_CLAIM_WORKLIFE_DYNAMIC" glidein_publish="True" job_publish="True" parameter="True" type="expr" value="cpus*(1*3600)"/> <attr name="GLIDEIN_Max_Walltime" glidein_publish="True" job_publish="True" parameter="True" type="int" value="2592000"/> diff --git a/compiled/fnal/global/frontend.xml b/compiled/fnal/global/frontend.xml index 24dfff60ce6fbbfe65060298b4053f194248114f..324fb71ba2d6f7d973bd50c8e5f3f5ab76dfde38 100644 --- a/compiled/fnal/global/frontend.xml +++ b/compiled/fnal/global/frontend.xml @@ -132,7 +132,7 @@ <attr name="GLIDEIN_OVERLOAD_ENABLED" glidein_publish="True" job_publish="True" parameter="True" type="expr" value="False"/> <attr name="PREFER_IPV4" glidein_publish="True" job_publish="False" parameter="False" type="expr" value="False"/> <attr name="CHIRP_DELAYED_UPDATE_MAX_ATTRS" glidein_publish="True" job_publish="True" parameter="True" type="int" value="200"/> - <attr name="CMS_MATCH_MICROARCH" glidein_publish="True" job_publish="True" parameter="True" type="expr" value="(Microarch is undefined || REQUIRED_MINIMUM_MICROARCH is undefined || REQUIRED_MINIMUM_MICROARCH<=int(substr(split(Microarch,"-")[1],1)))"/> + <attr name="CMS_MATCH_MICROARCH" glidein_publish="True" job_publish="True" parameter="True" type="expr" value="(Microarch is undefined || REQUIRED_MINIMUM_MICROARCH is undefined || REQUIRED_MINIMUM_MICROARCH<=int(substr(split(Microarch,"-")[1],1)))"/> <attr name="GLIDEIN_CLAIM_WORKLIFE_DYNAMIC" glidein_publish="True" job_publish="True" parameter="True" type="expr" value="cpus*(6*3600)"/> <attr name="OSG_SINGULARITY_BINARY" glidein_publish="True" job_publish="True" parameter="True" type="string" value="/cvmfs/oasis.opensciencegrid.org/mis/apptainer/1.2.5/bin/apptainer"/> </attrs> diff --git a/compiled/fnal/itb/frontend.xml b/compiled/fnal/itb/frontend.xml index b1292313a811fd7e962930bbfb02704e7f1c249d..6e54346354b98e32ee665cd14e3173efb6a7832d 100644 --- a/compiled/fnal/itb/frontend.xml +++ b/compiled/fnal/itb/frontend.xml @@ -117,7 +117,7 @@ <attr name="GLIDEIN_OVERLOAD_ENABLED" glidein_publish="True" job_publish="True" parameter="True" type="expr" value="False"/> <attr name="PREFER_IPV4" glidein_publish="True" job_publish="False" parameter="False" type="expr" value="False"/> <attr name="CHIRP_DELAYED_UPDATE_MAX_ATTRS" glidein_publish="True" job_publish="True" parameter="True" type="int" value="200"/> - <attr name="CMS_MATCH_MICROARCH" glidein_publish="True" job_publish="True" parameter="True" type="expr" value="(Microarch is undefined || REQUIRED_MINIMUM_MICROARCH is undefined || REQUIRED_MINIMUM_MICROARCH<=int(substr(split(Microarch,"-")[1],1)))"/> + <attr name="CMS_MATCH_MICROARCH" glidein_publish="True" job_publish="True" parameter="True" type="expr" value="(Microarch is undefined || REQUIRED_MINIMUM_MICROARCH is undefined || REQUIRED_MINIMUM_MICROARCH<=int(substr(split(Microarch,"-")[1],1)))"/> <attr name="GLIDEIN_CLAIM_WORKLIFE_DYNAMIC" glidein_publish="True" job_publish="True" parameter="True" type="expr" value="cpus*(6*3600)"/> <attr name="GLIDEIN_DEBUG_OUTPUT" glidein_publish="True" job_publish="True" parameter="True" type="string" value="True"/> <attr name="GLIDEIN_DEBUG_OPTIONS" glidein_publish="True" job_publish="True" parameter="True" type="string" value="userjob"/> diff --git a/compiled/fnal/tier0/frontend.xml b/compiled/fnal/tier0/frontend.xml index 49303bf3d5e9aedc7037e534004511f5138eabae..2c2d7700341b99320fc433f29021428100aa5037 100644 --- a/compiled/fnal/tier0/frontend.xml +++ b/compiled/fnal/tier0/frontend.xml @@ -129,7 +129,7 @@ <attr name="GLIDEIN_OVERLOAD_ENABLED" glidein_publish="True" job_publish="True" parameter="True" type="expr" value="False"/> <attr name="PREFER_IPV4" glidein_publish="True" job_publish="False" parameter="False" type="expr" value="False"/> <attr name="CHIRP_DELAYED_UPDATE_MAX_ATTRS" glidein_publish="True" job_publish="True" parameter="True" type="int" value="200"/> - <attr name="CMS_MATCH_MICROARCH" glidein_publish="True" job_publish="True" parameter="True" type="expr" value="(Microarch is undefined || REQUIRED_MINIMUM_MICROARCH is undefined || REQUIRED_MINIMUM_MICROARCH<=int(substr(split(Microarch,"-")[1],1)))"/> + <attr name="CMS_MATCH_MICROARCH" glidein_publish="True" job_publish="True" parameter="True" type="expr" value="(Microarch is undefined || REQUIRED_MINIMUM_MICROARCH is undefined || REQUIRED_MINIMUM_MICROARCH<=int(substr(split(Microarch,"-")[1],1)))"/> <attr name="GLIDECLIENT_Rank" glidein_publish="True" job_publish="True" parameter="True" type="string" value="1"/> <attr name="GLIDEIN_CLAIM_WORKLIFE_DYNAMIC" glidein_publish="True" job_publish="True" parameter="True" type="expr" value="cpus*(1*3600)"/> <attr name="GLIDEIN_Max_Walltime" glidein_publish="True" job_publish="True" parameter="True" type="int" value="2592000"/> diff --git a/inventory/classes/defaults.yml b/inventory/classes/defaults.yml index 5b6f81efcb8bbfe025eca37c07bf6d1e5ca0f214..05af011ea93d3c54e16e5e47398674fbbe213470 100644 --- a/inventory/classes/defaults.yml +++ b/inventory/classes/defaults.yml @@ -94,7 +94,7 @@ parameters: parameter: true type: expr value: >- - (Microarch is undefined || REQUIRED_MINIMUM_MICROARCH is undefined || REQUIRED_MINIMUM_MICROARCH<=int(substr(split(Microarch,"-")[1],1))) + (Microarch is undefined || REQUIRED_MINIMUM_MICROARCH is undefined || REQUIRED_MINIMUM_MICROARCH<=int(substr(split(Microarch,"-")[1],1))) extra_files: - absfname: ${validation_repo_path}/set_singularity_binds.sh after_entry: False