diff --git a/compiled/cern/global/frontend.xml b/compiled/cern/global/frontend.xml
index 72504f50a159c2b0d317df2331ea5514bbe44853..a58d63a8c5c4f7041213e2de96c66ef2d4897a10 100644
--- a/compiled/cern/global/frontend.xml
+++ b/compiled/cern/global/frontend.xml
@@ -106,7 +106,7 @@
<attrs>
<attr name="CMS_GLIDEIN_VERSION" glidein_publish="True" job_publish="True" parameter="True" type="int" value="32"/>
<attr name="CMSSF_ResourceType" glidein_publish="True" job_publish="True" parameter="True" type="string" value="x86_64:pledged"/>
- <attr name="CONDOR_VERSION" glidein_publish="False" job_publish="False" parameter="True" type="string" value="23.0.x"/>
+ <attr name="CONDOR_VERSION" glidein_publish="False" job_publish="False" parameter="True" type="string" value="24.0.x"/>
<attr name="CONDOR_OS" glidein_publish="False" job_publish="False" parameter="True" type="string" value="auto"/>
<attr name="GLIDEIN_Expose_Grid_Env" glidein_publish="True" job_publish="True" parameter="False" type="string" value="True"/>
<attr name="GLIDEIN_Job_Max_Time" comment="How long should a job continue to run when a glidein is in drain period" glidein_publish="True" job_publish="True" parameter="True" type="int" value="14400"/>
diff --git a/compiled/cern/itb/frontend.xml b/compiled/cern/itb/frontend.xml
index b8acb958589d0b9c6349ea318790cd5037b41c5d..d04b0b61aba3b3dd9a731592e541216552cb0cc2 100644
--- a/compiled/cern/itb/frontend.xml
+++ b/compiled/cern/itb/frontend.xml
@@ -91,7 +91,7 @@
<attrs>
<attr name="CMS_GLIDEIN_VERSION" glidein_publish="True" job_publish="True" parameter="True" type="int" value="32"/>
<attr name="CMSSF_ResourceType" glidein_publish="True" job_publish="True" parameter="True" type="string" value="x86_64:pledged"/>
- <attr name="CONDOR_VERSION" glidein_publish="False" job_publish="False" parameter="True" type="string" value="23.0.x"/>
+ <attr name="CONDOR_VERSION" glidein_publish="False" job_publish="False" parameter="True" type="string" value="24.0.x"/>
<attr name="CONDOR_OS" glidein_publish="False" job_publish="False" parameter="True" type="string" value="auto"/>
<attr name="GLIDEIN_Expose_Grid_Env" glidein_publish="True" job_publish="True" parameter="False" type="string" value="True"/>
<attr name="GLIDEIN_Job_Max_Time" comment="How long should a job continue to run when a glidein is in drain period" glidein_publish="True" job_publish="True" parameter="True" type="int" value="14400"/>
@@ -788,5 +788,8 @@
<file absfname="/data/gwms-frontend/repos/cms-validation-scripts/set_singularity_binds.sh" after_entry="False" after_group="False" const="True" executable="True" period="0" prefix="GLIDEIN_PS_" untar="False" wrapper="False">
<untar_options cond_attr="TRUE"/>
</file>
+ <file absfname="/data/gwms-frontend/repos/cmssam/SiteTests/WN/wn_cvmfs.sh" after_entry="True" after_group="False" const="True" executable="False" period="0" prefix="GLIDEIN_PS_" untar="False" wrapper="False">
+ <untar_options cond_attr="TRUE"/>
+ </file>
</files>
</frontend>
\ No newline at end of file
diff --git a/compiled/cern/itbdev/frontend.xml b/compiled/cern/itbdev/frontend.xml
index f7d0edfd6d93a9c7da1ea2c36adde5d604cc201d..e947eea1b556c7ae8812a635586944ce8d1efac1 100644
--- a/compiled/cern/itbdev/frontend.xml
+++ b/compiled/cern/itbdev/frontend.xml
@@ -58,7 +58,7 @@
<attrs>
<attr name="CMS_GLIDEIN_VERSION" glidein_publish="True" job_publish="True" parameter="True" type="int" value="32"/>
<attr name="CMSSF_ResourceType" glidein_publish="True" job_publish="True" parameter="True" type="string" value="x86_64:pledged"/>
- <attr name="CONDOR_VERSION" glidein_publish="False" job_publish="False" parameter="True" type="string" value="23.0.x"/>
+ <attr name="CONDOR_VERSION" glidein_publish="False" job_publish="False" parameter="True" type="string" value="24.0.x"/>
<attr name="CONDOR_OS" glidein_publish="False" job_publish="False" parameter="True" type="string" value="auto"/>
<attr name="GLIDEIN_Expose_Grid_Env" glidein_publish="True" job_publish="True" parameter="False" type="string" value="True"/>
<attr name="GLIDEIN_Job_Max_Time" comment="How long should a job continue to run when a glidein is in drain period" glidein_publish="True" job_publish="True" parameter="True" type="int" value="14400"/>
@@ -752,5 +752,8 @@
<file absfname="/data/gwms-frontend/repos/cms-validation-scripts/set_singularity_binds.sh" after_entry="False" after_group="False" const="True" executable="True" period="0" prefix="GLIDEIN_PS_" untar="False" wrapper="False">
<untar_options cond_attr="TRUE"/>
</file>
+ <file absfname="/data/gwms-frontend/repos/cmssam/SiteTests/WN/wn_cvmfs.sh" after_entry="True" after_group="False" const="True" executable="False" period="0" prefix="GLIDEIN_PS_" untar="False" wrapper="False">
+ <untar_options cond_attr="TRUE"/>
+ </file>
</files>
</frontend>
\ No newline at end of file
diff --git a/compiled/cern/tier0/frontend.xml b/compiled/cern/tier0/frontend.xml
index 7bc944ba12f8de6832df0e9c7d5305242e62c8f9..805d8115d174a7cf561d4a62512ba098ea925e12 100644
--- a/compiled/cern/tier0/frontend.xml
+++ b/compiled/cern/tier0/frontend.xml
@@ -102,7 +102,7 @@
<attrs>
<attr name="CMS_GLIDEIN_VERSION" glidein_publish="True" job_publish="True" parameter="True" type="int" value="32"/>
<attr name="CMSSF_ResourceType" glidein_publish="True" job_publish="True" parameter="True" type="string" value="x86_64:pledged"/>
- <attr name="CONDOR_VERSION" glidein_publish="False" job_publish="False" parameter="True" type="string" value="23.0.x"/>
+ <attr name="CONDOR_VERSION" glidein_publish="False" job_publish="False" parameter="True" type="string" value="24.0.x"/>
<attr name="CONDOR_OS" glidein_publish="False" job_publish="False" parameter="True" type="string" value="auto"/>
<attr name="GLIDEIN_Expose_Grid_Env" glidein_publish="True" job_publish="True" parameter="False" type="string" value="True"/>
<attr name="GLIDEIN_Job_Max_Time" comment="How long should a job continue to run when a glidein is in drain period" glidein_publish="True" job_publish="True" parameter="True" type="int" value="14400"/>
diff --git a/compiled/cern/volunteer/frontend.xml b/compiled/cern/volunteer/frontend.xml
index 7132eabaff2e45d8c10e0104a8531474206b7718..28f76f93650e216324e8cad7bd40c9468ce802f9 100644
--- a/compiled/cern/volunteer/frontend.xml
+++ b/compiled/cern/volunteer/frontend.xml
@@ -58,7 +58,7 @@
<attrs>
<attr name="CMS_GLIDEIN_VERSION" glidein_publish="True" job_publish="True" parameter="True" type="int" value="32"/>
<attr name="CMSSF_ResourceType" glidein_publish="True" job_publish="True" parameter="True" type="string" value="x86_64:pledged"/>
- <attr name="CONDOR_VERSION" glidein_publish="False" job_publish="False" parameter="True" type="string" value="23.0.x"/>
+ <attr name="CONDOR_VERSION" glidein_publish="False" job_publish="False" parameter="True" type="string" value="24.0.x"/>
<attr name="CONDOR_OS" glidein_publish="False" job_publish="False" parameter="True" type="string" value="auto"/>
<attr name="GLIDEIN_Expose_Grid_Env" glidein_publish="True" job_publish="True" parameter="False" type="string" value="True"/>
<attr name="GLIDEIN_Job_Max_Time" comment="How long should a job continue to run when a glidein is in drain period" glidein_publish="True" job_publish="True" parameter="True" type="int" value="14400"/>
diff --git a/compiled/fnal/global/frontend.xml b/compiled/fnal/global/frontend.xml
index 9ce55c841e94e7806062204d07327680e5a2abef..7858f43e1c832b2a9d32bd786d8a4b59ea9e865a 100644
--- a/compiled/fnal/global/frontend.xml
+++ b/compiled/fnal/global/frontend.xml
@@ -97,16 +97,16 @@
</match>
<monitor base_dir="/var/lib/gwms-frontend/web-area/monitor" flot_dir="/usr/share/javascriptrrd/flot" javascriptRRD_dir="/usr/share/javascriptrrd/js" jquery_dir="/usr/share/javascriptrrd/flot"/>
<monitor_footer display_txt="" href_link=""/>
- <security classad_proxy="/etc/gwms-frontend/proxies/fe_proxy" proxy_DN="/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/OU=Fermilab/CN=cmssrvz05.fnal.gov/CN=1628757376" proxy_selection_plugin="ProxyAll" security_name="fecmsglobalbackup" sym_key="aes_256_cbc">
+ <security classad_proxy="/etc/gwms-frontend/proxies/fe_proxy" proxy_DN="/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/OU=Fermilab/CN=cmssrv2426.fnal.gov/CN=1628757376" proxy_selection_plugin="ProxyAll" security_name="fecmsglobalbackup" sym_key="aes_256_cbc">
<credentials>
</credentials>
</security>
- <stage base_dir="/var/lib/gwms-frontend/web-area/stage" use_symlink="True" web_base_url="http://cmssrvz05.fnal.gov:8319/vofrontend/stage"/>
+ <stage base_dir="/var/lib/gwms-frontend/web-area/stage" use_symlink="True" web_base_url="http://cmssrv2426.fnal.gov:8319/vofrontend/stage"/>
<work base_dir="/var/lib/gwms-frontend/vofrontend" base_log_dir="/var/log/gwms-frontend"/>
<attrs>
<attr name="CMS_GLIDEIN_VERSION" glidein_publish="True" job_publish="True" parameter="True" type="int" value="32"/>
<attr name="CMSSF_ResourceType" glidein_publish="True" job_publish="True" parameter="True" type="string" value="x86_64:pledged"/>
- <attr name="CONDOR_VERSION" glidein_publish="False" job_publish="False" parameter="True" type="string" value="23.0.x"/>
+ <attr name="CONDOR_VERSION" glidein_publish="False" job_publish="False" parameter="True" type="string" value="24.0.x"/>
<attr name="CONDOR_OS" glidein_publish="False" job_publish="False" parameter="True" type="string" value="auto"/>
<attr name="GLIDEIN_Expose_Grid_Env" glidein_publish="True" job_publish="True" parameter="False" type="string" value="True"/>
<attr name="GLIDEIN_Job_Max_Time" comment="How long should a job continue to run when a glidein is in drain period" glidein_publish="True" job_publish="True" parameter="True" type="int" value="14400"/>
diff --git a/compiled/fnal/itb/frontend.xml b/compiled/fnal/itb/frontend.xml
index cb5f9db9283775a97a516f0155a0798c25216a20..8a88c56250e51e9f0b62b82db88630e5b4b42b6e 100644
--- a/compiled/fnal/itb/frontend.xml
+++ b/compiled/fnal/itb/frontend.xml
@@ -91,7 +91,7 @@
<attrs>
<attr name="CMS_GLIDEIN_VERSION" glidein_publish="True" job_publish="True" parameter="True" type="int" value="32"/>
<attr name="CMSSF_ResourceType" glidein_publish="True" job_publish="True" parameter="True" type="string" value="x86_64:pledged"/>
- <attr name="CONDOR_VERSION" glidein_publish="False" job_publish="False" parameter="True" type="string" value="23.0.x"/>
+ <attr name="CONDOR_VERSION" glidein_publish="False" job_publish="False" parameter="True" type="string" value="24.0.x"/>
<attr name="CONDOR_OS" glidein_publish="False" job_publish="False" parameter="True" type="string" value="auto"/>
<attr name="GLIDEIN_Expose_Grid_Env" glidein_publish="True" job_publish="True" parameter="False" type="string" value="True"/>
<attr name="GLIDEIN_Job_Max_Time" comment="How long should a job continue to run when a glidein is in drain period" glidein_publish="True" job_publish="True" parameter="True" type="int" value="14400"/>
@@ -788,5 +788,8 @@
<file absfname="/etc/gwms-frontend/frontend_scripts/CMSglideinWMSValidation/set_singularity_binds.sh" after_entry="False" after_group="False" const="True" executable="True" period="0" prefix="GLIDEIN_PS_" untar="False" wrapper="False">
<untar_options cond_attr="TRUE"/>
</file>
+ <file absfname="/data/gwms-frontend/repos/cmssam/SiteTests/WN/wn_cvmfs.sh" after_entry="True" after_group="False" const="True" executable="False" period="0" prefix="GLIDEIN_PS_" untar="False" wrapper="False">
+ <untar_options cond_attr="TRUE"/>
+ </file>
</files>
</frontend>
\ No newline at end of file
diff --git a/compiled/fnal/tier0/frontend.xml b/compiled/fnal/tier0/frontend.xml
index 9c5d48ec99f39060ee275a3111bb2695a3fe9e3a..160e4af8091e02c97ccd27f4b8c223de10522f41 100644
--- a/compiled/fnal/tier0/frontend.xml
+++ b/compiled/fnal/tier0/frontend.xml
@@ -103,7 +103,7 @@
<attrs>
<attr name="CMS_GLIDEIN_VERSION" glidein_publish="True" job_publish="True" parameter="True" type="int" value="32"/>
<attr name="CMSSF_ResourceType" glidein_publish="True" job_publish="True" parameter="True" type="string" value="x86_64:pledged"/>
- <attr name="CONDOR_VERSION" glidein_publish="False" job_publish="False" parameter="True" type="string" value="23.0.x"/>
+ <attr name="CONDOR_VERSION" glidein_publish="False" job_publish="False" parameter="True" type="string" value="24.0.x"/>
<attr name="CONDOR_OS" glidein_publish="False" job_publish="False" parameter="True" type="string" value="auto"/>
<attr name="GLIDEIN_Expose_Grid_Env" glidein_publish="True" job_publish="True" parameter="False" type="string" value="True"/>
<attr name="GLIDEIN_Job_Max_Time" comment="How long should a job continue to run when a glidein is in drain period" glidein_publish="True" job_publish="True" parameter="True" type="int" value="14400"/>
diff --git a/inventory/classes/common.yml b/inventory/classes/common.yml
index 5f369fd2bed0b4e2214793c921f29b616040736e..fa624628a3fc36af4846980b1c379b316db8ff81 100644
--- a/inventory/classes/common.yml
+++ b/inventory/classes/common.yml
@@ -4,7 +4,7 @@ parameters:
target: ${target_name}
factory_collectors: []
schedds: []
- condor_version: 23.0.x
+ condor_version: 24.0.x
singularity_images: "default:/cvmfs/singularity.opensciencegrid.org/cmssw/cms:rhel8-itb-x86_64,rhel6:/cvmfs/singularity.opensciencegrid.org/cmssw/cms:rhel6-itb-x86_64,rhel7:/cvmfs/singularity.opensciencegrid.org/cmssw/cms:rhel7-itb-x86_64,rhel8:/cvmfs/singularity.opensciencegrid.org/cmssw/cms:rhel8-itb-x86_64,rhel9:/cvmfs/singularity.opensciencegrid.org/cmssw/cms:rhel9-itb-x86_64"
extra_attrs:
# Remove all of these?
diff --git a/inventory/classes/fnal/common.yml b/inventory/classes/fnal/common.yml
index 82131bc6329933b5755b3f8198d2490eac7feb73..0ebfc1fed18ecdd131853a543f119fb2514a21eb 100644
--- a/inventory/classes/fnal/common.yml
+++ b/inventory/classes/fnal/common.yml
@@ -7,10 +7,10 @@ parameters:
secondary: true
ha_frontend_name: "CMSG-v1_0"
classad_proxy: "/etc/gwms-frontend/proxies/fe_proxy"
- proxy_DN: "/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/OU=Fermilab/CN=cmssrvz05.fnal.gov/CN=1628757376"
+ proxy_DN: "/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/OU=Fermilab/CN=cmssrv2426.fnal.gov/CN=1628757376"
proxy_security_name: "CMSG-v1_0"
proxy_path_local: /etc/gwms-frontend/proxies/cms_local_proxy
proxy_path: /etc/gwms-frontend/proxies/cms_pilot_proxy
validation_repo_path: /etc/gwms-frontend/frontend_scripts/CMSglideinWMSValidation
my_identity: fecmsglobalbackup
- frontend_fqdn: cmssrvz05.fnal.gov:8319
\ No newline at end of file
+ frontend_fqdn: cmssrv2426.fnal.gov:8319
\ No newline at end of file
diff --git a/inventory/classes/global.yml b/inventory/classes/global.yml
index a18c73493bc911f57d8ee928f4066ecda772d469..858da768c7da444108b548a677a882a53bc3f29d 100644
--- a/inventory/classes/global.yml
+++ b/inventory/classes/global.yml
@@ -5,7 +5,7 @@ parameters:
idle_vms_total_global:
curb: 20000
max: 22000
- condor_version: 23.0.x
+ condor_version: 24.0.x
extra_attrs:
- name: OSG_SINGULARITY_BINARY
glidein_publish: true
diff --git a/inventory/classes/itb.yml b/inventory/classes/itb.yml
index 1fc4768db73a0feb90f748c62d6b87d058859789..b284ee2e7c7d11b05c86da378c01bf0241b1096a 100644
--- a/inventory/classes/itb.yml
+++ b/inventory/classes/itb.yml
@@ -2,7 +2,7 @@ parameters:
kapitan:
vars:
target: ${target_name}
- condor_version: 23.0.x
+ condor_version: 24.0.x
extra_attrs:
# - name: ALL_DEBUG
# glidein_publish: true
@@ -348,3 +348,13 @@ parameters:
# prefix: GLIDEIN_PS_
# untar: false
# wrapper: false
+ extra_files:
+ - absfname: /data/gwms-frontend/repos/cmssam/SiteTests/WN/wn_cvmfs.sh
+ after_entry: true
+ after_group: false
+ const: true
+ executable: false
+ period: 0
+ prefix: GLIDEIN_PS_
+ untar: false
+ wrapper: false
diff --git a/inventory/classes/tier0.yml b/inventory/classes/tier0.yml
index 5a394d15a5f9afb76a276307d32d09b7ce8f9b9d..111954c49f30157d18cbf0728ffb0890ce1601b9 100644
--- a/inventory/classes/tier0.yml
+++ b/inventory/classes/tier0.yml
@@ -136,7 +136,7 @@ parameters:
group: c1
node: vocms0824.cern.ch:9621-9700
secondary: true
- condor_version: 23.0.x
+ condor_version: 24.0.x
singularity_images: "default:/cvmfs/singularity.opensciencegrid.org/cmssw/cms:rhel8-x86_64,rhel6:/cvmfs/singularity.opensciencegrid.org/cmssw/cms:rhel6-x86_64,rhel7:/cvmfs/singularity.opensciencegrid.org/cmssw/cms:rhel7-x86_64,rhel8:/cvmfs/singularity.opensciencegrid.org/cmssw/cms:rhel8-x86_64,rhel9:/cvmfs/singularity.opensciencegrid.org/cmssw/cms:rhel9-x86_64"
extra_attrs:
# Remove all of these?
diff --git a/inventory/classes/volunteer.yml b/inventory/classes/volunteer.yml
index 82c8b40b1f56cceb9bf6908de0c5583b1c6b1679..c8216b8fffdf790665763fea923bc18cfc05be5c 100644
--- a/inventory/classes/volunteer.yml
+++ b/inventory/classes/volunteer.yml
@@ -17,7 +17,7 @@ parameters:
running_glideins_total_global:
curb: 500000
max: 550000
- condor_version: 23.0.x
+ condor_version: 24.0.x
singularity_images: "default:/cvmfs/singularity.opensciencegrid.org/cmssw/cms:rhel8-itb-x86_64,rhel6:/cvmfs/singularity.opensciencegrid.org/cmssw/cms:rhel6-itb-x86_64,rhel7:/cvmfs/singularity.opensciencegrid.org/cmssw/cms:rhel7-itb-x86_64,rhel8:/cvmfs/singularity.opensciencegrid.org/cmssw/cms:rhel8-itb-x86_64,rhel9:/cvmfs/singularity.opensciencegrid.org/cmssw/cms:rhel9-itb-x86_64"
~extra_attrs:
- name: OSG_SINGULARITY_BINARY