lsst-ctrl-platform-s3df 30.0.0rc2__py3-none-any.whl → 30.0.1rc1__py3-none-any.whl

lsst/ctrl/platform/s3df/etc/templates/allocation.sh.template

@@ -53,7 +53,26 @@ 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
+# 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]}"
+  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
+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

lsst/ctrl/platform/s3df/etc/templates/dynamic_slots.template

@@ -3,4 +3,4 @@ NUM_SLOTS=1
 NUM_SLOTS_TYPE_1=1
 SLOT_TYPE_1=cpus=$ENV(GNUMCORES),ram=$ENV(GMEM),swap=100%,disk=100%
 SLOT_TYPE_1_PARTITIONABLE = TRUE
-CLAIM_WORKLIFE = 100000
+CLAIM_WORKLIFE = 300

{lsst_ctrl_platform_s3df-30.0.0rc2.dist-info → lsst_ctrl_platform_s3df-30.0.1rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-ctrl-platform-s3df
-Version: 30.0.0rc2
+Version: 30.0.1rc1
 Summary: Configuration and template files for s3df ctrl-execute platform.
 Project-URL: Source, https://github.com/lsst/ctrl_platform_s3df
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>

{lsst_ctrl_platform_s3df-30.0.0rc2.dist-info → lsst_ctrl_platform_s3df-30.0.1rc1.dist-info}/RECORD

@@ -7,11 +7,11 @@ lsst/ctrl/platform/s3df/etc/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQe
 lsst/ctrl/platform/s3df/etc/config/execConfig.py,sha256=nT3XYbRNo9i0UAcOHmlcXRlWSmTUOyC1T1BOl4Odl8g,239
 lsst/ctrl/platform/s3df/etc/config/slurmConfig.py,sha256=coGp9thxBSAXsvSknGT2az8A2KhdEjtUwKh-Yc84-dA,224
 lsst/ctrl/platform/s3df/etc/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lsst/ctrl/platform/s3df/etc/templates/allocation.sh.template,sha256=uM0iJUWNkI4vcgH0LEbKCEChbt9HBzgU4rXUPlb7xag,2896
-lsst/ctrl/platform/s3df/etc/templates/dynamic_slots.template,sha256=9eWolKIRHaa7XYoSZCMKlc9oSJ4GCSqok74u-Cmg9OY,157
+lsst/ctrl/platform/s3df/etc/templates/allocation.sh.template,sha256=K3q5_gUZp2za9R021vbPA_Z87c7qq_GL0oKo5ZVlW8E,3565
+lsst/ctrl/platform/s3df/etc/templates/dynamic_slots.template,sha256=WvEOZB284qWnhfqkfNgFqWz-gDfDzoZ27JGtj9N5UGk,154
 lsst/ctrl/platform/s3df/etc/templates/generic.slurm.template,sha256=kaXyjyRUxGDp5c3xramM06fxcMHd_riO2kY2Gn5ZiDY,535
 lsst/ctrl/platform/s3df/etc/templates/glidein_condor_config.template,sha256=8JTigNfvCfpe3CmRwfrntkAt5q9b5SLEQzKBcOND4TE,2518
-lsst_ctrl_platform_s3df-30.0.0rc2.dist-info/METADATA,sha256=SXRGiImM0BeEoPM4ZdXf8U9LelteGJVG1Z4eDLl2KS8,947
-lsst_ctrl_platform_s3df-30.0.0rc2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-lsst_ctrl_platform_s3df-30.0.0rc2.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-lsst_ctrl_platform_s3df-30.0.0rc2.dist-info/RECORD,,
+lsst_ctrl_platform_s3df-30.0.1rc1.dist-info/METADATA,sha256=dJQBTJf9Eanw68_O21QoWk7ropPEtm9GVDrvzMefVAk,947
+lsst_ctrl_platform_s3df-30.0.1rc1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+lsst_ctrl_platform_s3df-30.0.1rc1.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+lsst_ctrl_platform_s3df-30.0.1rc1.dist-info/RECORD,,