From 7b4c2179839f042623a76f183f1efec20f256367 Mon Sep 17 00:00:00 2001 From: Cole Bollig Date: Thu, 31 Aug 2023 16:53:40 -0500 Subject: [PATCH 1/4] HTCONDOR-1968: Warn about old job router configuration syntax deprecation -Added warning message to all provided configuration files at the use of one of the deprecated macros -In verify_ce_config.py if using the old configuration display warning message --- config/01-ce-router-defaults.conf | 8 ++++++++ config/01-ce-router.conf | 8 ++++++++ config/02-ce-bosco-defaults.conf | 8 ++++++++ config/02-ce-bosco.conf | 8 ++++++++ config/02-ce-condor-defaults.conf | 9 ++++++++- config/02-ce-condor.conf | 9 ++++++++- config/02-ce-lsf-defaults.conf | 8 ++++++++ config/02-ce-lsf.conf | 8 ++++++++ config/02-ce-pbs-defaults.conf | 8 ++++++++ config/02-ce-pbs.conf | 8 ++++++++ config/02-ce-sge-defaults.conf | 8 ++++++++ config/02-ce-sge.conf | 8 ++++++++ config/02-ce-slurm-defaults.conf | 8 ++++++++ config/02-ce-slurm.conf | 8 ++++++++ .../puppet/osg_ce_condor/files/config.d/02-ce-pbs.conf | 8 ++++++++ src/verify_ce_config.py | 10 ++++++++++ 16 files changed, 130 insertions(+), 2 deletions(-) diff --git a/config/01-ce-router-defaults.conf b/config/01-ce-router-defaults.conf index 084196ca2..2a68b7a97 100644 --- a/config/01-ce-router-defaults.conf +++ b/config/01-ce-router-defaults.conf @@ -106,6 +106,14 @@ SCHEDD_ATTRS = $(SCHEDD_ATTRS) HTCondorCEVersion grid_resource # JOB_ROUTER_DEFAULTS = $(JOB_ROUTER_DEFAULTS) [set_foo = 1;] # MERGE_JOB_ROUTER_DEFAULT_ADS=True +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +# 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 +# HTCondor. New configuration syntax for the job router is defined using +# JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: +# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration +# Note: The removal will occur earlier in the development series HTCondor V23. +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_DEFAULTS = $(JOB_ROUTER_DEFAULTS_GENERATED) # Use JOB_ROUTER_DEFAULTS + JOB_ROUTER_ENTRIES by default instead of diff --git a/config/01-ce-router.conf b/config/01-ce-router.conf index 12882e430..16e99aeb5 100644 --- a/config/01-ce-router.conf +++ b/config/01-ce-router.conf @@ -40,6 +40,14 @@ ROUTED_JOB_MAX_TIME = 4320 # JOB_ROUTER_DEFAULTS = $(JOB_ROUTER_DEFAULTS) [set_foo = 1;] # MERGE_JOB_ROUTER_DEFAULT_ADS=True +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +# 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 +# HTCondor. New configuration syntax for the job router is defined using +# JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: +# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration +# Note: The removal will occur earlier in the development series HTCondor V23. +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_DEFAULTS = $(JOB_ROUTER_DEFAULTS_GENERATED) diff --git a/config/02-ce-bosco-defaults.conf b/config/02-ce-bosco-defaults.conf index 12d0dec5e..af47bdfd5 100644 --- a/config/02-ce-bosco-defaults.conf +++ b/config/02-ce-bosco-defaults.conf @@ -10,6 +10,14 @@ # 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 +# HTCondor. New configuration syntax for the job router is defined using +# JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: +# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration +# Note: The removal will occur earlier in the development series HTCondor V23. +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES = \ [ \ GridResource = "batch $(BOSCO_RMS) $(BOSCO_ENDPOINT)"; \ diff --git a/config/02-ce-bosco.conf b/config/02-ce-bosco.conf index 22b36ca67..a396b09c3 100644 --- a/config/02-ce-bosco.conf +++ b/config/02-ce-bosco.conf @@ -8,6 +8,14 @@ # 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 +# HTCondor. New configuration syntax for the job router is defined using +# JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: +# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration +# Note: The removal will occur earlier in the development series HTCondor V23. +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES = \ [ \ GridResource = "batch $(BOSCO_RMS) $(BOSCO_ENDPOINT)"; \ diff --git a/config/02-ce-condor-defaults.conf b/config/02-ce-condor-defaults.conf index fd8a035b2..ca66f3c31 100644 --- a/config/02-ce-condor-defaults.conf +++ b/config/02-ce-condor-defaults.conf @@ -10,7 +10,14 @@ ############################################################################### # 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 +# HTCondor. New configuration syntax for the job router is defined using +# JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: +# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration +# Note: The removal will occur earlier in the development series HTCondor V23. +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ TargetUniverse = 5; diff --git a/config/02-ce-condor.conf b/config/02-ce-condor.conf index e2ea39d84..da2a9576f 100644 --- a/config/02-ce-condor.conf +++ b/config/02-ce-condor.conf @@ -8,7 +8,14 @@ ############################################################################### # 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 +# HTCondor. New configuration syntax for the job router is defined using +# JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: +# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration +# Note: The removal will occur earlier in the development series HTCondor V23. +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ TargetUniverse = 5; diff --git a/config/02-ce-lsf-defaults.conf b/config/02-ce-lsf-defaults.conf index bd2cef064..75a67d7c9 100644 --- a/config/02-ce-lsf-defaults.conf +++ b/config/02-ce-lsf-defaults.conf @@ -9,6 +9,14 @@ ############################################################################### # 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 +# HTCondor. New configuration syntax for the job router is defined using +# JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: +# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration +# Note: The removal will occur earlier in the development series HTCondor V23. +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ GridResource = "batch lsf"; diff --git a/config/02-ce-lsf.conf b/config/02-ce-lsf.conf index faff36e2e..503c4d41b 100644 --- a/config/02-ce-lsf.conf +++ b/config/02-ce-lsf.conf @@ -7,6 +7,14 @@ ############################################################################### # 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 +# HTCondor. New configuration syntax for the job router is defined using +# JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: +# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration +# Note: The removal will occur earlier in the development series HTCondor V23. +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ GridResource = "batch lsf"; diff --git a/config/02-ce-pbs-defaults.conf b/config/02-ce-pbs-defaults.conf index 7da20cf56..542ee82bb 100644 --- a/config/02-ce-pbs-defaults.conf +++ b/config/02-ce-pbs-defaults.conf @@ -9,6 +9,14 @@ ############################################################################### # 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 +# HTCondor. New configuration syntax for the job router is defined using +# JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: +# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration +# Note: The removal will occur earlier in the development series HTCondor V23. +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ GridResource = "batch pbs"; diff --git a/config/02-ce-pbs.conf b/config/02-ce-pbs.conf index 848786c02..521106344 100644 --- a/config/02-ce-pbs.conf +++ b/config/02-ce-pbs.conf @@ -7,6 +7,14 @@ ############################################################################### # 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 +# HTCondor. New configuration syntax for the job router is defined using +# JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: +# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration +# Note: The removal will occur earlier in the development series HTCondor V23. +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ GridResource = "batch pbs"; diff --git a/config/02-ce-sge-defaults.conf b/config/02-ce-sge-defaults.conf index 526aba16f..3af1d79bd 100644 --- a/config/02-ce-sge-defaults.conf +++ b/config/02-ce-sge-defaults.conf @@ -9,6 +9,14 @@ ############################################################################### # 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 +# HTCondor. New configuration syntax for the job router is defined using +# JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: +# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration +# Note: The removal will occur earlier in the development series HTCondor V23. +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ GridResource = "batch sge"; diff --git a/config/02-ce-sge.conf b/config/02-ce-sge.conf index 13e150364..e34d72302 100644 --- a/config/02-ce-sge.conf +++ b/config/02-ce-sge.conf @@ -7,6 +7,14 @@ ############################################################################### # 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 +# HTCondor. New configuration syntax for the job router is defined using +# JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: +# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration +# Note: The removal will occur earlier in the development series HTCondor V23. +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ GridResource = "batch sge"; diff --git a/config/02-ce-slurm-defaults.conf b/config/02-ce-slurm-defaults.conf index 122d0458c..77053d11f 100644 --- a/config/02-ce-slurm-defaults.conf +++ b/config/02-ce-slurm-defaults.conf @@ -9,6 +9,14 @@ ############################################################################### # Basic route for submitting to Slurm +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +# 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 +# HTCondor. New configuration syntax for the job router is defined using +# JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: +# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration +# Note: The removal will occur earlier in the development series HTCondor V23. +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ GridResource = "batch slurm"; diff --git a/config/02-ce-slurm.conf b/config/02-ce-slurm.conf index 1a0099785..53b953f0e 100644 --- a/config/02-ce-slurm.conf +++ b/config/02-ce-slurm.conf @@ -7,6 +7,14 @@ ############################################################################### # Basic route for submitting to Slurm +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +# 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 +# HTCondor. New configuration syntax for the job router is defined using +# JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: +# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration +# Note: The removal will occur earlier in the development series HTCondor V23. +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ GridResource = "batch slurm"; diff --git a/contrib/puppet/osg_ce_condor/files/config.d/02-ce-pbs.conf b/contrib/puppet/osg_ce_condor/files/config.d/02-ce-pbs.conf index 6bfa3cd8c..4e124deee 100644 --- a/contrib/puppet/osg_ce_condor/files/config.d/02-ce-pbs.conf +++ b/contrib/puppet/osg_ce_condor/files/config.d/02-ce-pbs.conf @@ -8,6 +8,14 @@ ############################################################################### # 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 +# HTCondor. New configuration syntax for the job router is defined using +# JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: +# https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration +# Note: The removal will occur earlier in the development series HTCondor V23. +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES = \ [ \ GridResource = "batch pbs"; \ diff --git a/src/verify_ce_config.py b/src/verify_ce_config.py index 19caf42f5..23cf5b67e 100755 --- a/src/verify_ce_config.py +++ b/src/verify_ce_config.py @@ -78,6 +78,16 @@ def main(): # If no JOB_ROUTER_ROUTE_ rules exist, verify JOB_ROUTER_DEFAULTS and JOB_ROUTER_ENTRIES else: + used_deprecated_knobs = [] + for knob in ['JOB_ROUTER_DEFAULTS', 'JOB_ROUTER_ENTRIES', 'JOB_ROUTER_ENTRIES_CMD','JOB_ROUTER_ENTRIES_FILE']: + if knob in htcondor.param: + used_deprecated_knobs.append(knob) + if len(used_deprecated_knobs) > 0: + warn("%s are deprecated and will be removed for V24 of HTCondor. New configuration" + % ", ".join(used_deprecated_knobs) + + " syntax for the job router is defined using JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_." + + " Note: The removal will occur during the lifetime of the HTCondor V23 feature series.\n") + for attr in ['JOB_ROUTER_DEFAULTS', 'JOB_ROUTER_ENTRIES']: try: config_val = htcondor.param[attr] From 467fa5200273e451cc0f2d5c16242b2600b3732f Mon Sep 17 00:00:00 2001 From: Cole Bollig Date: Fri, 1 Sep 2023 09:14:24 -0500 Subject: [PATCH 2/4] HTCONDOR-1968: Use better wording for when removal will occur --- config/01-ce-router-defaults.conf | 2 +- config/01-ce-router.conf | 2 +- config/02-ce-bosco-defaults.conf | 2 +- config/02-ce-bosco.conf | 2 +- config/02-ce-condor-defaults.conf | 2 +- config/02-ce-condor.conf | 2 +- config/02-ce-lsf-defaults.conf | 2 +- config/02-ce-lsf.conf | 2 +- config/02-ce-pbs-defaults.conf | 2 +- config/02-ce-pbs.conf | 2 +- config/02-ce-sge-defaults.conf | 2 +- config/02-ce-sge.conf | 2 +- config/02-ce-slurm-defaults.conf | 2 +- config/02-ce-slurm.conf | 2 +- contrib/puppet/osg_ce_condor/files/config.d/02-ce-pbs.conf | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/config/01-ce-router-defaults.conf b/config/01-ce-router-defaults.conf index 2a68b7a97..803d8e6b6 100644 --- a/config/01-ce-router-defaults.conf +++ b/config/01-ce-router-defaults.conf @@ -112,7 +112,7 @@ MERGE_JOB_ROUTER_DEFAULT_ADS=True # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_DEFAULTS = $(JOB_ROUTER_DEFAULTS_GENERATED) diff --git a/config/01-ce-router.conf b/config/01-ce-router.conf index 16e99aeb5..ab17cf199 100644 --- a/config/01-ce-router.conf +++ b/config/01-ce-router.conf @@ -46,7 +46,7 @@ MERGE_JOB_ROUTER_DEFAULT_ADS=True # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_DEFAULTS = $(JOB_ROUTER_DEFAULTS_GENERATED) diff --git a/config/02-ce-bosco-defaults.conf b/config/02-ce-bosco-defaults.conf index af47bdfd5..e5cf49cfb 100644 --- a/config/02-ce-bosco-defaults.conf +++ b/config/02-ce-bosco-defaults.conf @@ -16,7 +16,7 @@ # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES = \ [ \ diff --git a/config/02-ce-bosco.conf b/config/02-ce-bosco.conf index a396b09c3..10f182377 100644 --- a/config/02-ce-bosco.conf +++ b/config/02-ce-bosco.conf @@ -14,7 +14,7 @@ # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES = \ [ \ diff --git a/config/02-ce-condor-defaults.conf b/config/02-ce-condor-defaults.conf index ca66f3c31..930943eb3 100644 --- a/config/02-ce-condor-defaults.conf +++ b/config/02-ce-condor-defaults.conf @@ -16,7 +16,7 @@ # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ diff --git a/config/02-ce-condor.conf b/config/02-ce-condor.conf index da2a9576f..35ddec214 100644 --- a/config/02-ce-condor.conf +++ b/config/02-ce-condor.conf @@ -14,7 +14,7 @@ # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ diff --git a/config/02-ce-lsf-defaults.conf b/config/02-ce-lsf-defaults.conf index 75a67d7c9..75dcd642a 100644 --- a/config/02-ce-lsf-defaults.conf +++ b/config/02-ce-lsf-defaults.conf @@ -15,7 +15,7 @@ # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ diff --git a/config/02-ce-lsf.conf b/config/02-ce-lsf.conf index 503c4d41b..0b760ecc6 100644 --- a/config/02-ce-lsf.conf +++ b/config/02-ce-lsf.conf @@ -13,7 +13,7 @@ # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ diff --git a/config/02-ce-pbs-defaults.conf b/config/02-ce-pbs-defaults.conf index 542ee82bb..b75d4fa6e 100644 --- a/config/02-ce-pbs-defaults.conf +++ b/config/02-ce-pbs-defaults.conf @@ -15,7 +15,7 @@ # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ diff --git a/config/02-ce-pbs.conf b/config/02-ce-pbs.conf index 521106344..d8e5b776d 100644 --- a/config/02-ce-pbs.conf +++ b/config/02-ce-pbs.conf @@ -13,7 +13,7 @@ # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ diff --git a/config/02-ce-sge-defaults.conf b/config/02-ce-sge-defaults.conf index 3af1d79bd..a9049c513 100644 --- a/config/02-ce-sge-defaults.conf +++ b/config/02-ce-sge-defaults.conf @@ -15,7 +15,7 @@ # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ diff --git a/config/02-ce-sge.conf b/config/02-ce-sge.conf index e34d72302..0f36e0fbb 100644 --- a/config/02-ce-sge.conf +++ b/config/02-ce-sge.conf @@ -13,7 +13,7 @@ # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ diff --git a/config/02-ce-slurm-defaults.conf b/config/02-ce-slurm-defaults.conf index 77053d11f..287cf9dc7 100644 --- a/config/02-ce-slurm-defaults.conf +++ b/config/02-ce-slurm-defaults.conf @@ -15,7 +15,7 @@ # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ diff --git a/config/02-ce-slurm.conf b/config/02-ce-slurm.conf index 53b953f0e..b08819c46 100644 --- a/config/02-ce-slurm.conf +++ b/config/02-ce-slurm.conf @@ -13,7 +13,7 @@ # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES @=jre [ diff --git a/contrib/puppet/osg_ce_condor/files/config.d/02-ce-pbs.conf b/contrib/puppet/osg_ce_condor/files/config.d/02-ce-pbs.conf index 4e124deee..6c23f6f6a 100644 --- a/contrib/puppet/osg_ce_condor/files/config.d/02-ce-pbs.conf +++ b/contrib/puppet/osg_ce_condor/files/config.d/02-ce-pbs.conf @@ -14,7 +14,7 @@ # HTCondor. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For new syntax example visit: # https://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration -# Note: The removal will occur earlier in the development series HTCondor V23. +# Note: The removal will occur during the lifetime of the HTCondor V23 feature series. #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! JOB_ROUTER_ENTRIES = \ [ \ From 219a475da7e09fee69cd74f0e49fdf25cf1618b6 Mon Sep 17 00:00:00 2001 From: Cole Bollig Date: Fri, 1 Sep 2023 10:31:08 -0500 Subject: [PATCH 3/4] HTCONDOR-1968: Minor re-wording, example link, and python syntax improvements --- config/01-ce-router-defaults.conf | 2 +- config/01-ce-router.conf | 2 +- config/02-ce-bosco-defaults.conf | 2 +- config/02-ce-bosco.conf | 2 +- config/02-ce-condor-defaults.conf | 2 +- config/02-ce-condor.conf | 2 +- config/02-ce-lsf-defaults.conf | 2 +- config/02-ce-lsf.conf | 2 +- config/02-ce-pbs-defaults.conf | 2 +- config/02-ce-pbs.conf | 2 +- config/02-ce-sge-defaults.conf | 2 +- config/02-ce-sge.conf | 2 +- config/02-ce-slurm-defaults.conf | 2 +- config/02-ce-slurm.conf | 2 +- .../puppet/osg_ce_condor/files/config.d/02-ce-pbs.conf | 2 +- src/verify_ce_config.py | 8 ++++---- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/config/01-ce-router-defaults.conf b/config/01-ce-router-defaults.conf index 803d8e6b6..c21905fb0 100644 --- a/config/01-ce-router-defaults.conf +++ b/config/01-ce-router-defaults.conf @@ -109,7 +109,7 @@ MERGE_JOB_ROUTER_DEFAULT_ADS=True #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# the HTCondor Software Suite. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. 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. diff --git a/config/01-ce-router.conf b/config/01-ce-router.conf index ab17cf199..10e545f60 100644 --- a/config/01-ce-router.conf +++ b/config/01-ce-router.conf @@ -43,7 +43,7 @@ MERGE_JOB_ROUTER_DEFAULT_ADS=True #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# the HTCondor Software Suite. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. 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. diff --git a/config/02-ce-bosco-defaults.conf b/config/02-ce-bosco-defaults.conf index e5cf49cfb..d6e1ebc2b 100644 --- a/config/02-ce-bosco-defaults.conf +++ b/config/02-ce-bosco-defaults.conf @@ -13,7 +13,7 @@ #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# the HTCondor Software Suite. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. 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. diff --git a/config/02-ce-bosco.conf b/config/02-ce-bosco.conf index 10f182377..b8b44618f 100644 --- a/config/02-ce-bosco.conf +++ b/config/02-ce-bosco.conf @@ -11,7 +11,7 @@ #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# the HTCondor Software Suite. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. 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. diff --git a/config/02-ce-condor-defaults.conf b/config/02-ce-condor-defaults.conf index 930943eb3..0061475e4 100644 --- a/config/02-ce-condor-defaults.conf +++ b/config/02-ce-condor-defaults.conf @@ -13,7 +13,7 @@ #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# the HTCondor Software Suite. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. 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. diff --git a/config/02-ce-condor.conf b/config/02-ce-condor.conf index 35ddec214..bba1d9609 100644 --- a/config/02-ce-condor.conf +++ b/config/02-ce-condor.conf @@ -11,7 +11,7 @@ #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# the HTCondor Software Suite. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. 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. diff --git a/config/02-ce-lsf-defaults.conf b/config/02-ce-lsf-defaults.conf index 75dcd642a..341aad049 100644 --- a/config/02-ce-lsf-defaults.conf +++ b/config/02-ce-lsf-defaults.conf @@ -12,7 +12,7 @@ #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# the HTCondor Software Suite. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. 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. diff --git a/config/02-ce-lsf.conf b/config/02-ce-lsf.conf index 0b760ecc6..d0befe6e3 100644 --- a/config/02-ce-lsf.conf +++ b/config/02-ce-lsf.conf @@ -10,7 +10,7 @@ #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# the HTCondor Software Suite. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. 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. diff --git a/config/02-ce-pbs-defaults.conf b/config/02-ce-pbs-defaults.conf index b75d4fa6e..0048075eb 100644 --- a/config/02-ce-pbs-defaults.conf +++ b/config/02-ce-pbs-defaults.conf @@ -12,7 +12,7 @@ #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# the HTCondor Software Suite. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. 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. diff --git a/config/02-ce-pbs.conf b/config/02-ce-pbs.conf index d8e5b776d..f7be72fa7 100644 --- a/config/02-ce-pbs.conf +++ b/config/02-ce-pbs.conf @@ -10,7 +10,7 @@ #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# the HTCondor Software Suite. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. 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. diff --git a/config/02-ce-sge-defaults.conf b/config/02-ce-sge-defaults.conf index a9049c513..dbd1b0327 100644 --- a/config/02-ce-sge-defaults.conf +++ b/config/02-ce-sge-defaults.conf @@ -12,7 +12,7 @@ #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# the HTCondor Software Suite. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. 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. diff --git a/config/02-ce-sge.conf b/config/02-ce-sge.conf index 0f36e0fbb..03ca83c7f 100644 --- a/config/02-ce-sge.conf +++ b/config/02-ce-sge.conf @@ -10,7 +10,7 @@ #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# the HTCondor Software Suite. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. 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. diff --git a/config/02-ce-slurm-defaults.conf b/config/02-ce-slurm-defaults.conf index 287cf9dc7..a6b828d26 100644 --- a/config/02-ce-slurm-defaults.conf +++ b/config/02-ce-slurm-defaults.conf @@ -12,7 +12,7 @@ #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# the HTCondor Software Suite. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. 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. diff --git a/config/02-ce-slurm.conf b/config/02-ce-slurm.conf index b08819c46..b8a614aee 100644 --- a/config/02-ce-slurm.conf +++ b/config/02-ce-slurm.conf @@ -10,7 +10,7 @@ #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# the HTCondor Software Suite. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. 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. diff --git a/contrib/puppet/osg_ce_condor/files/config.d/02-ce-pbs.conf b/contrib/puppet/osg_ce_condor/files/config.d/02-ce-pbs.conf index 6c23f6f6a..e0d25718e 100644 --- a/contrib/puppet/osg_ce_condor/files/config.d/02-ce-pbs.conf +++ b/contrib/puppet/osg_ce_condor/files/config.d/02-ce-pbs.conf @@ -11,7 +11,7 @@ #!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # 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 -# HTCondor. New configuration syntax for the job router is defined using +# the HTCondor Software Suite. New configuration syntax for the job router is defined using # JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. 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. diff --git a/src/verify_ce_config.py b/src/verify_ce_config.py index 23cf5b67e..ac3b6d63d 100755 --- a/src/verify_ce_config.py +++ b/src/verify_ce_config.py @@ -83,10 +83,10 @@ def main(): if knob in htcondor.param: used_deprecated_knobs.append(knob) if len(used_deprecated_knobs) > 0: - warn("%s are deprecated and will be removed for V24 of HTCondor. New configuration" - % ", ".join(used_deprecated_knobs) - + " syntax for the job router is defined using JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_." - + " Note: The removal will occur during the lifetime of the HTCondor V23 feature series.\n") + warn(f"{', '.join(used_deprecated_knobs)} are deprecated and will be removed for V24 of HTCondor. New configuration" + + " syntax for the job router is defined using JOB_ROUTER_ROUTE_NAMES and JOB_ROUTER_ROUTE_. For example" + + " use of new syntax visit:\nhttps://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration\n\n" + + " Note: The removal will occur during the lifetime of the HTCondor V23 feature series.\n") for attr in ['JOB_ROUTER_DEFAULTS', 'JOB_ROUTER_ENTRIES']: try: From c975ac7a66a5d16489c0b333f3f035076d94c757 Mon Sep 17 00:00:00 2001 From: Cole Bollig <50028144+ColeBollig@users.noreply.github.com> Date: Fri, 1 Sep 2023 13:20:36 -0500 Subject: [PATCH 4/4] HTCONDOR-1968: Small wording change Expand message for job router syntax deprecation to be more inclusive to the entirety of the HTCSS. Co-authored-by: Brian Lin --- src/verify_ce_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/verify_ce_config.py b/src/verify_ce_config.py index ac3b6d63d..8ba476b31 100755 --- a/src/verify_ce_config.py +++ b/src/verify_ce_config.py @@ -83,7 +83,7 @@ def main(): if knob in htcondor.param: used_deprecated_knobs.append(knob) if len(used_deprecated_knobs) > 0: - warn(f"{', '.join(used_deprecated_knobs)} are deprecated and will be removed for V24 of HTCondor. New configuration" + warn(f"{', '.join(used_deprecated_knobs)} 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_. For example" + " use of new syntax visit:\nhttps://htcondor.readthedocs.io/en/latest/grid-computing/job-router.html#an-example-configuration\n\n" + " Note: The removal will occur during the lifetime of the HTCondor V23 feature series.\n")