From dfb85611d3c412435b8381ac155119a1116bc44c Mon Sep 17 00:00:00 2001 From: Greg Daues Date: Thu, 15 Jan 2026 10:15:17 -0800 Subject: [PATCH 1/2] DM-53801: script update to detect OS and set htcondor RELEASE DIR --- .../s3df/etc/templates/allocation.sh.template | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/python/lsst/ctrl/platform/s3df/etc/templates/allocation.sh.template b/python/lsst/ctrl/platform/s3df/etc/templates/allocation.sh.template index c065a57..90f9fdd 100644 --- a/python/lsst/ctrl/platform/s3df/etc/templates/allocation.sh.template +++ b/python/lsst/ctrl/platform/s3df/etc/templates/allocation.sh.template @@ -53,7 +53,22 @@ export _condor_CONDOR_HOST=${RUBIN_COLLECTOR_HOST} export _condor_COLLECTOR_HOST=${RUBIN_COLLECTOR_HOST} export _condor_CCB_ADDRESS=${RUBIN_COLLECTOR_HOST} -export RELEASE_DIR=/sdf/group/rubin/sw/htcondor +OSIN=`cat /etc/os-release | grep VERSION_ID` +while IFS='"' read -ra TOK; do + FULL_VERSION="${TOK[1]}" + echo "FULL_VERSION $FULL_VERSION" + while IFS='.' read -ra TOKEN; do + MAJOR_VERSION="${TOKEN[0]}" + done <<< "$FULL_VERSION" +done <<< "$OSIN" +echo "MAJOR_VERSION $MAJOR_VERSION" +if [ $MAJOR_VERSION == 9 ]; then + echo "It is Rocky9 Torino" + export RELEASE_DIR=/sdf/group/rubin/sw/htcondor.d/rocky9/current +else + echo "RHEL8 standard" + export RELEASE_DIR=/sdf/group/rubin/sw/htcondor +fi export _CONDOR_RELEASE_DIR=${RELEASE_DIR} export _CONDOR_SBIN=${RELEASE_DIR}/sbin export _CONDOR_FILETRANSFER_PLUGINS=${RELEASE_DIR}/libexec/curl_plugin From 37d752d0e0e612d266e27c8246fe69b55e28afdd Mon Sep 17 00:00:00 2001 From: Greg Daues Date: Thu, 15 Jan 2026 13:50:09 -0800 Subject: [PATCH 2/2] DM-53801: comments on RELEASE_DIR, plus print it out --- .../ctrl/platform/s3df/etc/templates/allocation.sh.template | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/python/lsst/ctrl/platform/s3df/etc/templates/allocation.sh.template b/python/lsst/ctrl/platform/s3df/etc/templates/allocation.sh.template index 90f9fdd..afd69fe 100644 --- a/python/lsst/ctrl/platform/s3df/etc/templates/allocation.sh.template +++ b/python/lsst/ctrl/platform/s3df/etc/templates/allocation.sh.template @@ -53,6 +53,9 @@ export _condor_CONDOR_HOST=${RUBIN_COLLECTOR_HOST} export _condor_COLLECTOR_HOST=${RUBIN_COLLECTOR_HOST} export _condor_CCB_ADDRESS=${RUBIN_COLLECTOR_HOST} +# Determining the OS MAJOR_VERSION in order to utilize an +# appropriate HTCondor binary tarball for RELEASE_DIR. +# HTCondor releases different binaries for Alma8, Alma9, etc. OSIN=`cat /etc/os-release | grep VERSION_ID` while IFS='"' read -ra TOK; do FULL_VERSION="${TOK[1]}" @@ -69,6 +72,7 @@ else echo "RHEL8 standard" export RELEASE_DIR=/sdf/group/rubin/sw/htcondor fi +echo "Using RELEASE_DIR ${RELEASE_DIR}" export _CONDOR_RELEASE_DIR=${RELEASE_DIR} export _CONDOR_SBIN=${RELEASE_DIR}/sbin export _CONDOR_FILETRANSFER_PLUGINS=${RELEASE_DIR}/libexec/curl_plugin