htcondor · JaimeFrey · May 6, 2024 · Jan 31, 2024
diff --git a/config/01-ce-router-defaults.conf b/config/01-ce-router-defaults.conf
@@ -101,7 +101,7 @@ grid_resource = strcat("condor ", ifThenElse(size("$(SCHEDD_NAME)") > 0, "$(SCHE
 SCHEDD_ATTRS = $(SCHEDD_ATTRS) HTCondorCEVersion grid_resource
 
 # Use the defaults generated by the condor_ce_router_defaults script.  To add
-# additional defaults, add additional lines of the form:
+# additional defaults in the old syntax, add additional lines of the form:
 #
 #   JOB_ROUTER_DEFAULTS = $(JOB_ROUTER_DEFAULTS) [set_foo = 1;]
 #
@@ -116,9 +116,10 @@ MERGE_JOB_ROUTER_DEFAULT_ADS=True
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 JOB_ROUTER_DEFAULTS = $(JOB_ROUTER_DEFAULTS_GENERATED)
 
-# Use JOB_ROUTER_DEFAULTS + JOB_ROUTER_ENTRIES by default instead of
-# the new-style job router transforms (HTCONDOR-243)
-JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = True
+# Disable JOB_ROUTER_DEFAULTS + JOB_ROUTER_ENTRIES by default.
+# These represent the old route syntax, which will be removed for
+# HTCondor V24.
+JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = False
 
 
 #################################

diff --git a/config/01-ce-router.conf b/config/01-ce-router.conf
@@ -51,9 +51,7 @@ MERGE_JOB_ROUTER_DEFAULT_ADS=True
 JOB_ROUTER_DEFAULTS = $(JOB_ROUTER_DEFAULTS_GENERATED)
 
 
-# Set the JobRouter configuration syntax, defaults to True
+# Set whether to enable the old Job Router route syntax, defaults to False
 # (i.e. JOB_ROUTER_DEFAULTS combined with JOB_ROUTER_ENTRIES).
-# Set to 'False' to use the new 'JOB_ROUTER_TRANSFORM_*' and 'JOB_ROUTER_ROUTE_*'
-# style configuration (requires HTCondor 8.9)
 #
 # JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = True
diff --git a/config/02-ce-bosco-defaults.conf b/config/02-ce-bosco-defaults.conf
@@ -10,17 +10,9 @@
 
 # Basic route for submitting to BOSCO
 # Use osg-configure to set BOSCO_RMS and BOSCO_ENDPOINT
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
-#          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
-#          the HTCondor Software Suite. New configuration syntax for the job router is defined using
-#          JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For new syntax example visit:
-# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
-#   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-JOB_ROUTER_ENTRIES = \
-   [ \
-     GridResource = "batch $(BOSCO_RMS) $(BOSCO_ENDPOINT)"; \
-     TargetUniverse = 9; \
-     name = "Local_BOSCO"; \
-   ]
+JOB_ROUTER_ROUTE_SSH_Endpoint @=jrt
+  TargetUniverse = 9
+  GridResource = "batch $(BOSCO_RMS) $(BOSCO_ENDPOINT)"
+@jrt
+
+JOB_ROUTER_ROUTE_NAMES = SSH_Endpoint
diff --git a/config/02-ce-bosco.conf b/config/02-ce-bosco.conf
@@ -8,6 +8,13 @@
 
 # Basic route for submitting to BOSCO
 # Use osg-configure to set BOSCO_RMS and BOSCO_ENDPOINT
+JOB_ROUTER_ROUTE_SSH_Endpoint @=jrt
+  TargetUniverse = 9
+  GridResource = "batch $(BOSCO_RMS) $(BOSCO_ENDPOINT)"
+@jrt
+
+JOB_ROUTER_ROUTE_NAMES = SSH_Endpoint
+
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
 #          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
@@ -16,21 +23,15 @@
 # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
 #   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-JOB_ROUTER_ENTRIES = \
-   [ \
-     GridResource = "batch $(BOSCO_RMS) $(BOSCO_ENDPOINT)"; \
-     TargetUniverse = 9; \
-     name = "Local_BOSCO"; \
-   ]
-
-
-# New-style job route configuration (requires HTCondor 8.9) To use
-# this instead of JOB_ROUTER_ENTRIES, set "JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = False"
+# Old-style job route configuration. To use this instead of
+# JOB_ROUTER_ROUTE_xxx, set "JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = True"
 # in /etc/condor-ce/config.d/01-ce-router.conf and uncomment the following:
 #
-# JOB_ROUTER_ROUTE_SSH_Endpoint @=jrt
-#   TargetUniverse = 9
-#   GridResource = "batch $(BOSCO_RMS) $(BOSCO_ENDPOINT)"
-# @jrt
+# JOB_ROUTER_ENTRIES = \
+#    [ \
+#      GridResource = "batch $(BOSCO_RMS) $(BOSCO_ENDPOINT)"; \
+#      TargetUniverse = 9; \
+#      name = "Local_BOSCO"; \
+#    ]
 #
-# JOB_ROUTER_ROUTE_NAMES = SSH_Endpoint
+# JOB_ROUTER_ROUTE_NAMES = Local_BOSCO
diff --git a/config/02-ce-condor-defaults.conf b/config/02-ce-condor-defaults.conf
@@ -10,20 +10,11 @@
 ###############################################################################
 
 # Submit the job to the site Condor
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
-#          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
-#          the HTCondor Software Suite. New configuration syntax for the job router is defined using
-#          JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For new syntax example visit:
-# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
-#   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-JOB_ROUTER_ENTRIES @=jre
-[
-  TargetUniverse = 5;
-  name = "Local_Condor";
-]
-@jre
+JOB_ROUTER_ROUTE_Condor_Pool @=jrt
+  TargetUniverse = 5
+@jrt
+
+JOB_ROUTER_ROUTE_NAMES = Condor_Pool
 
 
 JOB_ROUTER_SCHEDD2_SPOOL=/var/lib/condor/spool

diff --git a/config/02-ce-condor.conf b/config/02-ce-condor.conf
@@ -8,6 +8,26 @@
 ###############################################################################
 
 # Submit the job to the site Condor
+JOB_ROUTER_ROUTE_Condor_Pool @=jrt
+  TargetUniverse = 5
+@jrt
+
+JOB_ROUTER_ROUTE_NAMES = Condor_Pool
+
+# Uncomment the following line to make use of the UID to HTCondor
+# accounting group mapfile (/etc/condor-ce/uid_acct_group.map)
+#
+# JOB_ROUTER_PRE_ROUTE_TRANSFORM_NAMES = $(JOB_ROUTER_PRE_ROUTE_TRANSFORM_NAMES) UidAcctGroup
+
+# Uncomment the following line to make use of the X.509 to HTCondor
+# accounting group mapfile (/etc/condor-ce/x509_acct_group.map)
+#
+# JOB_ROUTER_PRE_ROUTE_TRANSFORM_NAMES = $(JOB_ROUTER_PRE_ROUTE_TRANSFORM_NAMES) x509AcctGroup
+
+JOB_ROUTER_SCHEDD2_SPOOL=/var/lib/condor/spool
+JOB_ROUTER_SCHEDD2_NAME=$(FULL_HOSTNAME)
+JOB_ROUTER_SCHEDD2_POOL=$(FULL_HOSTNAME):9618
+
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
 #          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
@@ -16,39 +36,15 @@
 # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
 #   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-JOB_ROUTER_ENTRIES @=jre
-[
-  TargetUniverse = 5;
-  name = "Local_Condor";
-]
-@jre
-
-
-JOB_ROUTER_SCHEDD2_SPOOL=/var/lib/condor/spool
-JOB_ROUTER_SCHEDD2_NAME=$(FULL_HOSTNAME)
-JOB_ROUTER_SCHEDD2_POOL=$(FULL_HOSTNAME):9618
-
-
-# New-style job route configuration (requires HTCondor 8.9) To use
-# this instead of JOB_ROUTER_ENTRIES, set "JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = False"
+# Old-style job route configuration. To use this instead of
+# JOB_ROUTER_ROUTE_xxx, set "JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = True"
 # in /etc/condor-ce/config.d/01-ce-router.conf and uncomment the following:
 #
-# JOB_ROUTER_ROUTE_Condor_Pool @=jrt
-#   TargetUniverse = 5
-# @jrt
+# JOB_ROUTER_ENTRIES @=jre
+# [
+#   TargetUniverse = 5;
+#   name = "Local_Condor";
+# ]
+# @jre
 #
-# JOB_ROUTER_ROUTE_NAMES = Condor_Pool
-
-
-# If using the new-style JobRouter configuration above, uncomment the following
-# line to make use of the UID to HTCondor accounting group mapfile
-# (/etc/condor-ce/uid_acct_group.map)
-#
-# JOB_ROUTER_PRE_ROUTE_TRANSFORM_NAMES = $(JOB_ROUTER_PRE_ROUTE_TRANSFORM_NAMES) UidAcctGroup
-
-
-# If using the new-style JobRouter configuration above, uncomment the following
-# line to make use of the X.509 to HTCondor accounting group mapfile
-# (/etc/condor-ce/x509_acct_group.map)
-#
-# JOB_ROUTER_PRE_ROUTE_TRANSFORM_NAMES = $(JOB_ROUTER_PRE_ROUTE_TRANSFORM_NAMES) x509AcctGroup
+# JOB_ROUTER_ROUTE_NAMES = Local_Condor
diff --git a/config/02-ce-lsf-defaults.conf b/config/02-ce-lsf-defaults.conf
@@ -9,18 +9,9 @@
 ###############################################################################
 
 # Basic route for submitting to LSF
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
-#          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
-#          the HTCondor Software Suite. New configuration syntax for the job router is defined using
-#          JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For new syntax example visit:
-# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
-#   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-JOB_ROUTER_ENTRIES @=jre
-[
-  GridResource = "batch lsf";
-  TargetUniverse = 9;
-  name = "Local_LSF";
-]
-@jre
+JOB_ROUTER_ROUTE_LSF_Cluster @=jrt
+  TargetUniverse = 9
+  GridResource = "batch lsf"
+@jrt
+
+JOB_ROUTER_ROUTE_NAMES = LSF_Cluster
diff --git a/config/02-ce-lsf.conf b/config/02-ce-lsf.conf
@@ -7,6 +7,13 @@
 ###############################################################################
 
 # Basic route for submitting to LSF
+JOB_ROUTER_ROUTE_LSF_Cluster @=jrt
+  TargetUniverse = 9
+  GridResource = "batch lsf"
+@jrt
+
+JOB_ROUTER_ROUTE_NAMES = LSF_Cluster
+
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
 #          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
@@ -15,22 +22,16 @@
 # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
 #   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-JOB_ROUTER_ENTRIES @=jre
-[
-  GridResource = "batch lsf";
-  TargetUniverse = 9;
-  name = "Local_LSF";
-]
-@jre
-
-
-# New-style job route configuration (requires HTCondor 8.9) To use
-# this instead of JOB_ROUTER_ENTRIES, set "JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = False"
+# Old-style job route configuration. To use this instead of
+# JOB_ROUTER_ROUTE_xxx, set "JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = True"
 # in /etc/condor-ce/config.d/01-ce-router.conf and uncomment the following:
 #
-# JOB_ROUTER_ROUTE_LSF_Cluster @=jrt
-#   TargetUniverse = 9
-#   GridResource = "batch lsf"
-# @jrt
+# JOB_ROUTER_ENTRIES @=jre
+# [
+#   GridResource = "batch lsf";
+#   TargetUniverse = 9;
+#   name = "Local_LSF";
+# ]
+# @jre
 #
-# JOB_ROUTER_ROUTE_NAMES = LSF_Cluster
+# JOB_ROUTER_ROUTE_NAMES = Local_LSF
diff --git a/config/02-ce-pbs-defaults.conf b/config/02-ce-pbs-defaults.conf
@@ -9,18 +9,9 @@
 ###############################################################################
 
 # Basic route for submitting to PBS
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
-#          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
-#          the HTCondor Software Suite. New configuration syntax for the job router is defined using
-#          JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For new syntax example visit:
-# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
-#   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-JOB_ROUTER_ENTRIES @=jre
-[
-  GridResource = "batch pbs";
-  TargetUniverse = 9;
-  name = "Local_PBS";
-]
-@jre
+JOB_ROUTER_ROUTE_PBS_Cluster @=jrt
+  TargetUniverse = 9
+  GridResource = "batch pbs"
+@jrt
+
+JOB_ROUTER_ROUTE_NAMES = PBS_Cluster
diff --git a/config/02-ce-pbs.conf b/config/02-ce-pbs.conf
@@ -7,6 +7,13 @@
 ###############################################################################
 
 # Basic route for submitting to PBS
+JOB_ROUTER_ROUTE_PBS_Cluster @=jrt
+  TargetUniverse = 9
+  GridResource = "batch pbs"
+@jrt
+
+JOB_ROUTER_ROUTE_NAMES = PBS_Cluster
+
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
 #          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
@@ -15,22 +22,16 @@
 # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
 #   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.
 #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-JOB_ROUTER_ENTRIES @=jre
-[
-  GridResource = "batch pbs";
-  TargetUniverse = 9;
-  name = "Local_PBS";
-]
-@jre
-
-
-# New-style job route configuration (requires HTCondor 8.9) To use
-# this instead of JOB_ROUTER_ENTRIES, set "JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = False"
+# Old-style job route configuration. To use this instead of
+# JOB_ROUTER_ROUTE_xxx, set "JOB_ROUTER_USE_DEPRECATED_ROUTER_ENTRIES = True"
 # in /etc/condor-ce/config.d/01-ce-router.conf and uncomment the following:
 #
-# JOB_ROUTER_ROUTE_PBS_Cluster @=jrt
-#   TargetUniverse = 9
-#   GridResource = "batch pbs"
-# @jrt
+# JOB_ROUTER_ENTRIES @=jre
+# [
+#   GridResource = "batch pbs";
+#   TargetUniverse = 9;
+#   name = "Local_PBS";
+# ]
+# @jre
 #
-# JOB_ROUTER_ROUTE_NAMES = PBS_Cluster
+# JOB_ROUTER_ROUTE_NAMES = Local_PBS
diff --git a/config/02-ce-sge-defaults.conf b/config/02-ce-sge-defaults.conf
@@ -9,18 +9,9 @@
 ###############################################################################
 
 # Basic route for submitting to SGE
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# Warning: JOB_ROUTER_DEFAULTS, JOB_ROUTER_ENTRIES, JOB_ROUTER_ENTRIES_CMD, and
-#          JOB_ROUTER_ENTRIES_FILE are deprecated and will be removed for V24 of
-#          the HTCondor Software Suite. New configuration syntax for the job router is defined using
-#          JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_<name>. For new syntax example visit:
-# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration
-#   Note: The removal will occur during the lifetime of the HTCondor V23 feature series.
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-JOB_ROUTER_ENTRIES @=jre
-[
-  GridResource = "batch sge";
-  TargetUniverse = 9;
-  name = "Local_SGE";
-]
-@jre
+JOB_ROUTER_ROUTE_SGE_Cluster @=jrt
+  TargetUniverse = 9
+  GridResource = "batch sge"
+@jrt
+
+JOB_ROUTER_ROUTE_NAMES = SGE_Cluster