lsst-ctrl-platform-s3df 29.2025.2100__tar.gz → 30.0.0__tar.gz

{lsst_ctrl_platform_s3df-29.2025.2100 → lsst_ctrl_platform_s3df-30.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-ctrl-platform-s3df
-Version: 29.2025.2100
+Version: 30.0.0
 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-29.2025.2100 → lsst_ctrl_platform_s3df-30.0.0}/pyproject.toml

@@ -23,6 +23,9 @@ dependencies = []
 [dependency-groups]
 dev = [
     "lsst-ctrl-execute",
+    # Until new ctrl-execute appears that can be pinned to support the
+    # pex_config changes, require the pex_config version
+    "lsst-pex-config >= 30.2026.300",
     "pre-commit>=4.0.1",
     "pytest",
     "pytest-cov",

{lsst_ctrl_platform_s3df-29.2025.2100 → lsst_ctrl_platform_s3df-30.0.0}/python/lsst/ctrl/platform/s3df/etc/templates/allocation.sh.template

@@ -53,8 +53,27 @@ 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
-export _CONDOR_RELEASE_DIR=${RELEASE_DIR}/sbin
+# 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-29.2025.2100 → lsst_ctrl_platform_s3df-30.0.0}/python/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-29.2025.2100 → lsst_ctrl_platform_s3df-30.0.0}/python/lsst/ctrl/platform/s3df/etc/templates/glidein_condor_config.template

@@ -21,6 +21,14 @@ ALLOW_DAEMON = *
 ALLOW_ADMINISTRATOR = $USER_NAME@sdfmilan*.sdf.slac.stanford.edu/sdfiana012.sdf.slac.stanford.edu
 ALLOW_ADMINISTRATOR = $(ALLOW_ADMINISTRATOR), $USER_NAME@sdfmilan*.sdf.slac.stanford.edu/sdfiana013.sdf.slac.stanford.edu
 ALLOW_ADMINISTRATOR = $(ALLOW_ADMINISTRATOR), $USER_NAME@sdfmilan*.sdf.slac.stanford.edu/sdfiana014.sdf.slac.stanford.edu
+ALLOW_ADMINISTRATOR = $(ALLOW_ADMINISTRATOR), $USER_NAME@sdfmilan*.sdf.slac.stanford.edu/sdfiana028.sdf.slac.stanford.edu
+ALLOW_ADMINISTRATOR = $(ALLOW_ADMINISTRATOR), $USER_NAME@sdfmilan*.sdf.slac.stanford.edu/sdfiana029.sdf.slac.stanford.edu
+ALLOW_ADMINISTRATOR = $(ALLOW_ADMINISTRATOR), $USER_NAME@sdfmilan*.sdf.slac.stanford.edu/sdfiana030.sdf.slac.stanford.edu
+ALLOW_ADMINISTRATOR = $(ALLOW_ADMINISTRATOR), $USER_NAME@sdfmilan*.sdf.slac.stanford.edu/sdfiana031.sdf.slac.stanford.edu
+ALLOW_ADMINISTRATOR = $(ALLOW_ADMINISTRATOR), $USER_NAME@sdfmilan*.sdf.slac.stanford.edu/sdfiana032.sdf.slac.stanford.edu
+ALLOW_ADMINISTRATOR = $(ALLOW_ADMINISTRATOR), $USER_NAME@sdfmilan*.sdf.slac.stanford.edu/sdfiana033.sdf.slac.stanford.edu
+ALLOW_ADMINISTRATOR = $(ALLOW_ADMINISTRATOR), $USER_NAME@sdfmilan*.sdf.slac.stanford.edu/sdfiana034.sdf.slac.stanford.edu
+ALLOW_ADMINISTRATOR = $(ALLOW_ADMINISTRATOR), $USER_NAME@sdfmilan*.sdf.slac.stanford.edu/sdfiana035.sdf.slac.stanford.edu
 
 use role:execute
 

{lsst_ctrl_platform_s3df-29.2025.2100 → lsst_ctrl_platform_s3df-30.0.0}/tests/test_load.py

@@ -10,7 +10,7 @@ def test_exec_config():
     exec_config_name = find_package_file("execConfig.py", platform="s3df")
 
     configuration = CondorConfig()
-    configuration.loadFromStream(exec_config_name)
+    configuration.load(exec_config_name)
     assert configuration.platform.scheduler == "slurm"
 
 
@@ -18,7 +18,7 @@ def test_allocation_config():
     slurm_config_name = find_package_file("slurmConfig.py", platform="s3df")
 
     configuration = AllocationConfig()
-    configuration.loadFromStream(slurm_config_name)
+    configuration.load(slurm_config_name)
     assert configuration.platform.queue == "$QUEUE"