From ee26df8dcc2f0400a7d6e5bec12ef47336ff1c49 Mon Sep 17 00:00:00 2001
From: "R. Florian von Cube" <ralf.florian.von.cube@cern.ch>
Date: Thu, 30 Jan 2025 13:37:55 +0100
Subject: [PATCH] Cast REQUIRED_MINIMUM_MICROARCH to int in
CMS_MATCH_MICROARCH.
---
compiled/cern/global/frontend.xml | 2 +-
compiled/cern/itb/frontend.xml | 2 +-
compiled/cern/itbdev/frontend.xml | 2 +-
compiled/cern/tier0/frontend.xml | 2 +-
compiled/fnal/global/frontend.xml | 2 +-
compiled/fnal/itb/frontend.xml | 2 +-
compiled/fnal/tier0/frontend.xml | 2 +-
inventory/classes/defaults.yml | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/compiled/cern/global/frontend.xml b/compiled/cern/global/frontend.xml
index dbec589..abb124d 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 7bf785f..13c158f 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 4da7c32..a14b9f9 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 738321e..a0331b9 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 324fb71..30f8c03 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 6e54346..9e65f75 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 2c2d770..7778499 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 05af011..c451a02 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
--
GitLab