diff --git a/compiled/cern/global/frontend.xml b/compiled/cern/global/frontend.xml index dbec589f6d68f6dabcd0275ba551030bf0c9c7e0..abb124ddb3e829330838693ac77b1bdb8ca4524d 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 || int(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 7bf785fa8afe2c1fcdee00c37e47b66eece62fe6..13c158fd6b2ca70043e5af511bd9662778562881 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 || int(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 4da7c329802f8cac0bfe57d6674151b8ee9b48b4..a14b9f927714350806b6cf7348e710c8257463a9 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 || int(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 738321e488cfe959ba95ced70eb735d9e8bea67a..a0331b9f6e2d66deb345dd9b688ed462c34d4676 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 || int(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 324fb71ba2d6f7d973bd50c8e5f3f5ab76dfde38..30f8c0382d68705a9fba5d81fd4b99a067aa8b89 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 || int(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 6e54346354b98e32ee665cd14e3173efb6a7832d..9e65f7508eecc756d7ca65040e65c04c8646ee0a 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 || int(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 2c2d7700341b99320fc433f29021428100aa5037..7778499ad78d7e77012d033355143b7f06398a82 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 || int(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 05af011ea93d3c54e16e5e47398674fbbe213470..c451a02a881f77ec99c2f9978ae10c641e49152b 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 || int(REQUIRED_MINIMUM_MICROARCH)<=int(substr(split(Microarch,"-")[1],1))) extra_files: - absfname: ${validation_repo_path}/set_singularity_binds.sh after_entry: False