diff --git a/cylc/flow/cfgspec/suite.py b/cylc/flow/cfgspec/suite.py index 573a031e46a..ad7a4c83df7 100644 --- a/cylc/flow/cfgspec/suite.py +++ b/cylc/flow/cfgspec/suite.py @@ -38,7 +38,6 @@ # where: # - value_type: value type (compulsory). # - default: the default value (optional). -# - allowed_2, ...: the only other allowed values of this setting (optional). SPEC = { 'meta': { 'description': [VDR.V_STRING, ''], @@ -149,6 +148,9 @@ }, 'runtime': { '__MANY__': { + 'execution polling intervals': [VDR.V_INTERVAL_LIST, None], + 'execution retry delays': [VDR.V_INTERVAL_LIST, None], + 'execution time limit': [VDR.V_INTERVAL], 'platform': [VDR.V_STRING], 'inherit': [VDR.V_STRING_LIST], 'init-script': [VDR.V_STRING], @@ -157,6 +159,8 @@ 'exit-script': [VDR.V_STRING], 'pre-script': [VDR.V_STRING], 'script': [VDR.V_STRING], + 'submission polling intervals': [VDR.V_INTERVAL_LIST, None], + 'submission retry delays': [VDR.V_INTERVAL_LIST, None], 'post-script': [VDR.V_STRING], 'extra log files': [VDR.V_STRING_LIST], 'work sub-directory': [VDR.V_STRING], @@ -181,13 +185,6 @@ 'job': { 'batch system': [VDR.V_STRING, 'background'], 'batch submit command template': [VDR.V_STRING], - # TODO All the remaining items to be moved to top level of TASK - # When platforms work is completed. - 'execution polling intervals': [VDR.V_INTERVAL_LIST, None], - 'execution retry delays': [VDR.V_INTERVAL_LIST, None], - 'execution time limit': [VDR.V_INTERVAL], - 'submission polling intervals': [VDR.V_INTERVAL_LIST, None], - 'submission retry delays': [VDR.V_INTERVAL_LIST, None], }, 'remote': { 'host': [VDR.V_STRING], @@ -208,7 +205,6 @@ 'mail smtp': [VDR.V_STRING], 'mail to': [VDR.V_STRING], 'submission timeout': [VDR.V_INTERVAL], - 'expired handler': [VDR.V_STRING_LIST, None], 'late offset': [VDR.V_INTERVAL, None], 'late handler': [VDR.V_STRING_LIST, None], @@ -305,22 +301,18 @@ def upg(cfg, descr): ['cylc', 'abort if any task fails'], ['cylc', 'events', 'abort if any task fails']) u.obsolete('8.0.0', ['runtime', '__MANY__', 'job', 'shell']) - # TODO uncomment these deprecations when ready - see todo in - # [runtime][__MANY__] section. - # for job_setting in [ - # 'execution polling intervals', - # 'execution retry delays', - # 'execution time limit', - # 'submission polling intervals', - # 'submission retry delays' - # ]: - # u.deprecate( - # '8.0.0', - # ['runtime', '__MANY__', 'job', job_setting], - # ['runtime', '__MANY__', job_setting] - # ) - # TODO - there are some simple changes to the config (items from [remote] - # and [job] moved up 1 level for example) which should be upgraded here. + for job_setting in [ + 'execution polling intervals', + 'execution retry delays', + 'execution time limit', + 'submission polling intervals', + 'submission retry delays' + ]: + u.deprecate( + '8.0.0', + ['runtime', '__MANY__', 'job', job_setting], + ['runtime', '__MANY__', job_setting] + ) u.upgrade() # Upgrader cannot do this type of move. diff --git a/cylc/flow/config.py b/cylc/flow/config.py index c2c8c662720..fc5dd2c37a5 100644 --- a/cylc/flow/config.py +++ b/cylc/flow/config.py @@ -1225,7 +1225,7 @@ def configure_sim_modes(self): for tdef in self.taskdefs.values(): # Compute simulated run time by scaling the execution limit. rtc = tdef.rtconfig - limit = rtc['job']['execution time limit'] + limit = rtc['execution time limit'] speedup = rtc['simulation']['speedup factor'] if limit and speedup: sleep_sec = (DurationParser().parse( @@ -1234,7 +1234,7 @@ def configure_sim_modes(self): sleep_sec = DurationParser().parse( str(rtc['simulation']['default run length']) ).get_seconds() - rtc['job']['execution time limit'] = ( + rtc['execution time limit'] = ( sleep_sec + DurationParser().parse(str( rtc['simulation']['time limit buffer'])).get_seconds() ) diff --git a/cylc/flow/task_job_mgr.py b/cylc/flow/task_job_mgr.py index 08a7a453b58..3b79624fb71 100644 --- a/cylc/flow/task_job_mgr.py +++ b/cylc/flow/task_job_mgr.py @@ -683,7 +683,7 @@ def _set_retry_timers(itask, rtconfig=None): for key, cfg_key in [ (TASK_STATUS_SUBMIT_RETRYING, 'submission retry delays'), (TASK_STATUS_RETRYING, 'execution retry delays')]: - delays = rtconfig['job'][cfg_key] + delays = rtconfig[cfg_key] if delays is None: delays = [] try: @@ -860,7 +860,7 @@ def _prep_submit_task_job_impl(self, suite, itask, rtconfig): batch_sys_conf = {} try: itask.summary[self.KEY_EXECUTE_TIME_LIMIT] = float( - rtconfig['job']['execution time limit']) + rtconfig['execution time limit']) except TypeError: pass diff --git a/flakytests/database/01-broadcast/suite.rc b/flakytests/database/01-broadcast/suite.rc index 1cbcd96a0e6..a139cacd47b 100644 --- a/flakytests/database/01-broadcast/suite.rc +++ b/flakytests/database/01-broadcast/suite.rc @@ -6,8 +6,7 @@ t1:submit => recover-t1 [runtime] [[t1]] script=test -n "${HELLO}" - [[[job]]] - execution retry delays=PT10M # prevent task failure + execution retry delays=PT10M # prevent task failure [[[environment]]] HELLO= [[recover-t1]] diff --git a/flakytests/database/02-retry/suite.rc b/flakytests/database/02-retry/suite.rc index 47ff5677ee1..950882e9af2 100644 --- a/flakytests/database/02-retry/suite.rc +++ b/flakytests/database/02-retry/suite.rc @@ -8,5 +8,4 @@ [runtime] [[t1]] script=test "${CYLC_TASK_SUBMIT_NUMBER}" -gt 2 - [[[job]]] - execution retry delays=2*PT0S + execution retry delays=2*PT0S diff --git a/flakytests/events/01-task/suite.rc b/flakytests/events/01-task/suite.rc index d0be664099e..89e94da01dc 100644 --- a/flakytests/events/01-task/suite.rc +++ b/flakytests/events/01-task/suite.rc @@ -41,8 +41,7 @@ do done cylc task message -p WARNING 'this is a user-defined warning message' """ - [[[job]]] - execution retry delays = PT3S + execution retry delays = PT3S [[[events]]] succeeded handler = {{ HANDLER }} warning handler = {{ HANDLER }} @@ -53,11 +52,10 @@ cylc task message -p WARNING 'this is a user-defined warning message' [[bar]] # submission retry and submission failed + submission retry delays = PT3S [[[events]]] submission failed handler = {{ HANDLER }} submission retry handler = {{ HANDLER }} - [[[job]]] - submission retry delays = PT3S [[[remote]]] host = NOHOST.NODOMAIN diff --git a/flakytests/execution-time-limit/04-poll/suite.rc b/flakytests/execution-time-limit/04-poll/suite.rc index 9ef342698ff..04192f678f4 100644 --- a/flakytests/execution-time-limit/04-poll/suite.rc +++ b/flakytests/execution-time-limit/04-poll/suite.rc @@ -28,6 +28,5 @@ __STATUS__ fi exit """ - [[[job]]] - execution time limit = PT10S - execution retry delays = PT0S + execution time limit = PT10S + execution retry delays = PT0S diff --git a/flakytests/hold-release/14-hold-kill/suite.rc b/flakytests/hold-release/14-hold-kill/suite.rc index 029148ab86a..f879acc7033 100644 --- a/flakytests/hold-release/14-hold-kill/suite.rc +++ b/flakytests/hold-release/14-hold-kill/suite.rc @@ -27,5 +27,4 @@ sleep 120 fi """ - [[[job]]] - execution retry delays = PT1S + execution retry delays = PT1S diff --git a/tests/cylc-edit/00-basic/include/suite-runtime.rc b/tests/cylc-edit/00-basic/include/suite-runtime.rc index 4088ffa54f4..70376ffc561 100644 --- a/tests/cylc-edit/00-basic/include/suite-runtime.rc +++ b/tests/cylc-edit/00-basic/include/suite-runtime.rc @@ -1,5 +1,4 @@ [runtime] [[foo, bar]] script=true - [[[job]]] - execution retry delays = 0.1 + execution retry delays = 0.1 diff --git a/tests/cylc-get-config/00-simple/section2.stdout b/tests/cylc-get-config/00-simple/section2.stdout index 4768fc3bf3d..f5e1626b071 100644 --- a/tests/cylc-get-config/00-simple/section2.stdout +++ b/tests/cylc-get-config/00-simple/section2.stdout @@ -1,1037 +1,1037 @@ -[[var_p2]] +[[root]] + execution polling intervals = + execution retry delays = + execution time limit = platform = - script = echo "RUN: run-var.sh" + inherit = + init-script = env-script = err-script = exit-script = - extra log files = - work sub-directory = - init-script = pre-script = + script = + submission polling intervals = + submission retry delays = post-script = - inherit = VAR, PARALLEL + extra log files = + work sub-directory = [[[meta]]] title = description = URL = + [[[simulation]]] + default run length = PT10S + speedup factor = + time limit buffer = PT30S + fail cycle points = + fail try 1 only = True + disable task event handlers = True + [[[environment filter]]] + include = + exclude = + [[[job]]] + batch system = background + batch submit command template = + [[[remote]]] + host = + owner = + suite definition directory = + retrieve job logs = + retrieve job logs max size = + retrieve job logs retry delays = [[[events]]] - submission timeout handler = + execution timeout = + handlers = + handler events = + handler retry delays = + mail events = + mail from = + mail retry delays = + mail smtp = + mail to = + submission timeout = + expired handler = + late offset = + late handler = submitted handler = started handler = - execution timeout handler = - expired handler = + succeeded handler = + failed handler = submission failed handler = - submission retry handler = warning handler = critical handler = - custom handler = - succeeded handler = retry handler = - failed handler = - late handler = - late offset = - handler events = - mail smtp = - handlers = - mail events = - mail retry delays = - handler retry delays = - mail to = - mail from = - execution timeout = - submission timeout = - [[[environment]]] - [[[parameter environment templates]]] - [[[directives]]] - job_type = parallel - [[[environment filter]]] - exclude = - include = - [[[outputs]]] - [[[simulation]]] - fail try 1 only = True - fail cycle points = - speedup factor = - disable task event handlers = True - default run length = PT10S - time limit buffer = PT30S + submission retry handler = + execution timeout handler = + submission timeout handler = + custom handler = [[[suite state polling]]] - interval = + user = host = + interval = max-polls = message = run-dir = - user = verbose mode = - [[[remote]]] - owner = - suite definition directory = - host = - retrieve job logs = - retrieve job logs max size = - retrieve job logs retry delays = - [[[job]]] - batch submit command template = - batch system = background - submission retry delays = - execution retry delays = - submission polling intervals = - execution polling intervals = - execution time limit = + [[[environment]]] + [[[directives]]] + [[[outputs]]] + [[[parameter environment templates]]] [[OPS]] - platform = script = echo "RUN: run-ops.sh" + execution polling intervals = + execution retry delays = + execution time limit = + platform = + inherit = + init-script = env-script = err-script = exit-script = - extra log files = - work sub-directory = - init-script = pre-script = + submission polling intervals = + submission retry delays = post-script = - inherit = + extra log files = + work sub-directory = [[[meta]]] title = description = URL = + [[[simulation]]] + default run length = PT10S + speedup factor = + time limit buffer = PT30S + fail cycle points = + fail try 1 only = True + disable task event handlers = True + [[[environment filter]]] + include = + exclude = + [[[job]]] + batch system = background + batch submit command template = + [[[remote]]] + host = + owner = + suite definition directory = + retrieve job logs = + retrieve job logs max size = + retrieve job logs retry delays = [[[events]]] - submission timeout handler = + execution timeout = + handlers = + handler events = + handler retry delays = + mail events = + mail from = + mail retry delays = + mail smtp = + mail to = + submission timeout = + expired handler = + late offset = + late handler = submitted handler = started handler = - execution timeout handler = - expired handler = + succeeded handler = + failed handler = submission failed handler = - submission retry handler = warning handler = critical handler = - custom handler = - succeeded handler = retry handler = - failed handler = - late handler = - late offset = - handler events = - mail smtp = - handlers = - mail events = - mail retry delays = - handler retry delays = - mail to = - mail from = - execution timeout = - submission timeout = - [[[environment]]] - [[[parameter environment templates]]] - [[[directives]]] - [[[environment filter]]] - exclude = - include = - [[[outputs]]] - [[[simulation]]] - fail try 1 only = True - fail cycle points = - speedup factor = - disable task event handlers = True - default run length = PT10S - time limit buffer = PT30S + submission retry handler = + execution timeout handler = + submission timeout handler = + custom handler = [[[suite state polling]]] - interval = + user = host = + interval = max-polls = message = run-dir = - user = verbose mode = - [[[remote]]] - owner = - suite definition directory = - host = - retrieve job logs = - retrieve job logs max size = - retrieve job logs retry delays = - [[[job]]] - batch submit command template = - batch system = background - submission retry delays = - execution retry delays = - submission polling intervals = - execution polling intervals = - execution time limit = -[[ops_s1]] + [[[environment]]] + [[[directives]]] + [[[outputs]]] + [[[parameter environment templates]]] +[[VAR]] + script = echo "RUN: run-var.sh" + execution polling intervals = + execution retry delays = + execution time limit = platform = - script = echo "RUN: run-ops.sh" + inherit = + init-script = env-script = err-script = exit-script = - extra log files = - work sub-directory = - init-script = pre-script = + submission polling intervals = + submission retry delays = post-script = - inherit = OPS, SERIAL + extra log files = + work sub-directory = [[[meta]]] title = description = URL = + [[[simulation]]] + default run length = PT10S + speedup factor = + time limit buffer = PT30S + fail cycle points = + fail try 1 only = True + disable task event handlers = True + [[[environment filter]]] + include = + exclude = + [[[job]]] + batch system = background + batch submit command template = + [[[remote]]] + host = + owner = + suite definition directory = + retrieve job logs = + retrieve job logs max size = + retrieve job logs retry delays = [[[events]]] - submission timeout handler = + execution timeout = + handlers = + handler events = + handler retry delays = + mail events = + mail from = + mail retry delays = + mail smtp = + mail to = + submission timeout = + expired handler = + late offset = + late handler = submitted handler = started handler = - execution timeout handler = - expired handler = + succeeded handler = + failed handler = submission failed handler = - submission retry handler = warning handler = critical handler = - custom handler = - succeeded handler = retry handler = - failed handler = - late handler = - late offset = - handler events = - mail smtp = - handlers = - mail events = - mail retry delays = - handler retry delays = - mail to = - mail from = - execution timeout = - submission timeout = - [[[environment]]] - [[[parameter environment templates]]] - [[[directives]]] - job_type = serial - [[[environment filter]]] - exclude = - include = - [[[outputs]]] - [[[simulation]]] - fail try 1 only = True - fail cycle points = - speedup factor = - disable task event handlers = True - default run length = PT10S - time limit buffer = PT30S + submission retry handler = + execution timeout handler = + submission timeout handler = + custom handler = [[[suite state polling]]] - interval = + user = host = + interval = max-polls = message = run-dir = - user = verbose mode = - [[[remote]]] - owner = - suite definition directory = - host = - retrieve job logs = - retrieve job logs max size = - retrieve job logs retry delays = - [[[job]]] - batch submit command template = - batch system = background - submission retry delays = - execution retry delays = - submission polling intervals = - execution polling intervals = - execution time limit = -[[ops_s2]] + [[[environment]]] + [[[directives]]] + [[[outputs]]] + [[[parameter environment templates]]] +[[SERIAL]] + execution polling intervals = + execution retry delays = + execution time limit = platform = - script = echo "RUN: run-ops.sh" + inherit = + init-script = env-script = err-script = exit-script = - extra log files = - work sub-directory = - init-script = pre-script = + script = + submission polling intervals = + submission retry delays = post-script = - inherit = OPS, SERIAL + extra log files = + work sub-directory = + [[[directives]]] + job_type = serial [[[meta]]] title = description = URL = + [[[simulation]]] + default run length = PT10S + speedup factor = + time limit buffer = PT30S + fail cycle points = + fail try 1 only = True + disable task event handlers = True + [[[environment filter]]] + include = + exclude = + [[[job]]] + batch system = background + batch submit command template = + [[[remote]]] + host = + owner = + suite definition directory = + retrieve job logs = + retrieve job logs max size = + retrieve job logs retry delays = [[[events]]] - submission timeout handler = + execution timeout = + handlers = + handler events = + handler retry delays = + mail events = + mail from = + mail retry delays = + mail smtp = + mail to = + submission timeout = + expired handler = + late offset = + late handler = submitted handler = started handler = - execution timeout handler = - expired handler = + succeeded handler = + failed handler = submission failed handler = - submission retry handler = warning handler = critical handler = - custom handler = - succeeded handler = retry handler = - failed handler = - late handler = - late offset = - handler events = - mail smtp = - handlers = - mail events = - mail retry delays = - handler retry delays = - mail to = - mail from = - execution timeout = - submission timeout = - [[[environment]]] - [[[parameter environment templates]]] - [[[directives]]] - job_type = serial - [[[environment filter]]] - exclude = - include = - [[[outputs]]] - [[[simulation]]] - fail try 1 only = True - fail cycle points = - speedup factor = - disable task event handlers = True - default run length = PT10S - time limit buffer = PT30S + submission retry handler = + execution timeout handler = + submission timeout handler = + custom handler = [[[suite state polling]]] - interval = + user = host = + interval = max-polls = message = run-dir = - user = verbose mode = - [[[remote]]] - owner = - suite definition directory = - host = - retrieve job logs = - retrieve job logs max size = - retrieve job logs retry delays = - [[[job]]] - batch submit command template = - batch system = background - submission retry delays = - execution retry delays = - submission polling intervals = - execution polling intervals = - execution time limit = -[[ops_p1]] + [[[environment]]] + [[[outputs]]] + [[[parameter environment templates]]] +[[PARALLEL]] + execution polling intervals = + execution retry delays = + execution time limit = platform = - script = echo "RUN: run-ops.sh" + inherit = + init-script = env-script = err-script = exit-script = - extra log files = - work sub-directory = - init-script = pre-script = + script = + submission polling intervals = + submission retry delays = post-script = - inherit = OPS, PARALLEL + extra log files = + work sub-directory = + [[[directives]]] + job_type = parallel [[[meta]]] title = description = URL = + [[[simulation]]] + default run length = PT10S + speedup factor = + time limit buffer = PT30S + fail cycle points = + fail try 1 only = True + disable task event handlers = True + [[[environment filter]]] + include = + exclude = + [[[job]]] + batch system = background + batch submit command template = + [[[remote]]] + host = + owner = + suite definition directory = + retrieve job logs = + retrieve job logs max size = + retrieve job logs retry delays = [[[events]]] - submission timeout handler = + execution timeout = + handlers = + handler events = + handler retry delays = + mail events = + mail from = + mail retry delays = + mail smtp = + mail to = + submission timeout = + expired handler = + late offset = + late handler = submitted handler = started handler = - execution timeout handler = - expired handler = + succeeded handler = + failed handler = submission failed handler = - submission retry handler = warning handler = critical handler = - custom handler = - succeeded handler = retry handler = - failed handler = - late handler = - late offset = - handler events = - mail smtp = - handlers = - mail events = - mail retry delays = - handler retry delays = - mail to = - mail from = - execution timeout = - submission timeout = - [[[environment]]] - [[[parameter environment templates]]] - [[[directives]]] - job_type = parallel - [[[environment filter]]] - exclude = - include = - [[[outputs]]] - [[[simulation]]] - fail try 1 only = True - fail cycle points = - speedup factor = - disable task event handlers = True - default run length = PT10S - time limit buffer = PT30S + submission retry handler = + execution timeout handler = + submission timeout handler = + custom handler = [[[suite state polling]]] - interval = + user = host = + interval = max-polls = message = run-dir = - user = verbose mode = - [[[remote]]] - owner = - suite definition directory = - host = - retrieve job logs = - retrieve job logs max size = - retrieve job logs retry delays = - [[[job]]] - batch submit command template = - batch system = background - submission retry delays = - execution retry delays = - submission polling intervals = - execution polling intervals = - execution time limit = -[[ops_p2]] - platform = + [[[environment]]] + [[[outputs]]] + [[[parameter environment templates]]] +[[ops_s1]] script = echo "RUN: run-ops.sh" + inherit = OPS, SERIAL + execution polling intervals = + execution retry delays = + execution time limit = + platform = + init-script = env-script = err-script = exit-script = - extra log files = - work sub-directory = - init-script = pre-script = + submission polling intervals = + submission retry delays = post-script = - inherit = OPS, PARALLEL + extra log files = + work sub-directory = + [[[directives]]] + job_type = serial [[[meta]]] title = description = URL = + [[[simulation]]] + default run length = PT10S + speedup factor = + time limit buffer = PT30S + fail cycle points = + fail try 1 only = True + disable task event handlers = True + [[[environment filter]]] + include = + exclude = + [[[job]]] + batch system = background + batch submit command template = + [[[remote]]] + host = + owner = + suite definition directory = + retrieve job logs = + retrieve job logs max size = + retrieve job logs retry delays = [[[events]]] - handler events = - mail smtp = + execution timeout = handlers = + handler events = + handler retry delays = mail events = + mail from = mail retry delays = - handler retry delays = + mail smtp = mail to = - mail from = - execution timeout = submission timeout = - submission timeout handler = + expired handler = + late offset = + late handler = submitted handler = started handler = - execution timeout handler = - expired handler = + succeeded handler = + failed handler = submission failed handler = - submission retry handler = warning handler = critical handler = - custom handler = - succeeded handler = retry handler = - failed handler = - late handler = - late offset = - [[[environment]]] - [[[parameter environment templates]]] - [[[directives]]] - job_type = parallel - [[[environment filter]]] - exclude = - include = - [[[outputs]]] - [[[simulation]]] - fail try 1 only = True - fail cycle points = - speedup factor = - disable task event handlers = True - default run length = PT10S - time limit buffer = PT30S + submission retry handler = + execution timeout handler = + submission timeout handler = + custom handler = [[[suite state polling]]] - interval = + user = host = + interval = max-polls = message = run-dir = - user = verbose mode = - [[[remote]]] - owner = - suite definition directory = - host = - retrieve job logs = - retrieve job logs max size = - retrieve job logs retry delays = - [[[job]]] - batch submit command template = - batch system = background - submission retry delays = - execution retry delays = - submission polling intervals = - execution polling intervals = - execution time limit = -[[var_p1]] + [[[environment]]] + [[[outputs]]] + [[[parameter environment templates]]] +[[ops_s2]] + script = echo "RUN: run-ops.sh" + inherit = OPS, SERIAL + execution polling intervals = + execution retry delays = + execution time limit = platform = - script = echo "RUN: run-var.sh" + init-script = env-script = err-script = exit-script = - extra log files = - work sub-directory = - init-script = pre-script = + submission polling intervals = + submission retry delays = post-script = - inherit = VAR, PARALLEL + extra log files = + work sub-directory = + [[[directives]]] + job_type = serial [[[meta]]] title = description = URL = + [[[simulation]]] + default run length = PT10S + speedup factor = + time limit buffer = PT30S + fail cycle points = + fail try 1 only = True + disable task event handlers = True + [[[environment filter]]] + include = + exclude = + [[[job]]] + batch system = background + batch submit command template = + [[[remote]]] + host = + owner = + suite definition directory = + retrieve job logs = + retrieve job logs max size = + retrieve job logs retry delays = [[[events]]] - handler events = - mail smtp = + execution timeout = handlers = + handler events = + handler retry delays = mail events = + mail from = mail retry delays = - handler retry delays = + mail smtp = mail to = - mail from = - execution timeout = submission timeout = - submission timeout handler = + expired handler = + late offset = + late handler = submitted handler = started handler = - execution timeout handler = - expired handler = + succeeded handler = + failed handler = submission failed handler = - submission retry handler = warning handler = critical handler = - custom handler = - succeeded handler = retry handler = - failed handler = - late handler = - late offset = - [[[environment]]] - [[[parameter environment templates]]] - [[[directives]]] - job_type = parallel - [[[environment filter]]] - exclude = - include = - [[[outputs]]] - [[[simulation]]] - fail try 1 only = True - fail cycle points = - speedup factor = - disable task event handlers = True - default run length = PT10S - time limit buffer = PT30S + submission retry handler = + execution timeout handler = + submission timeout handler = + custom handler = [[[suite state polling]]] - interval = + user = host = + interval = max-polls = message = run-dir = - user = verbose mode = - [[[remote]]] - owner = - suite definition directory = - host = - retrieve job logs = - retrieve job logs max size = - retrieve job logs retry delays = - [[[job]]] - batch submit command template = - batch system = background - submission retry delays = - execution retry delays = - submission polling intervals = - execution polling intervals = - execution time limit = -[[VAR]] + [[[environment]]] + [[[outputs]]] + [[[parameter environment templates]]] +[[ops_p1]] + script = echo "RUN: run-ops.sh" + inherit = OPS, PARALLEL + execution polling intervals = + execution retry delays = + execution time limit = platform = - script = echo "RUN: run-var.sh" + init-script = env-script = err-script = exit-script = - extra log files = - work sub-directory = - init-script = pre-script = + submission polling intervals = + submission retry delays = post-script = - inherit = + extra log files = + work sub-directory = + [[[directives]]] + job_type = parallel [[[meta]]] title = description = URL = + [[[simulation]]] + default run length = PT10S + speedup factor = + time limit buffer = PT30S + fail cycle points = + fail try 1 only = True + disable task event handlers = True + [[[environment filter]]] + include = + exclude = + [[[job]]] + batch system = background + batch submit command template = + [[[remote]]] + host = + owner = + suite definition directory = + retrieve job logs = + retrieve job logs max size = + retrieve job logs retry delays = [[[events]]] - handler events = - mail smtp = + execution timeout = handlers = + handler events = + handler retry delays = mail events = + mail from = mail retry delays = - handler retry delays = + mail smtp = mail to = - mail from = - execution timeout = submission timeout = - submission timeout handler = + expired handler = + late offset = + late handler = submitted handler = started handler = - execution timeout handler = - expired handler = + succeeded handler = + failed handler = submission failed handler = - submission retry handler = warning handler = critical handler = - custom handler = - succeeded handler = retry handler = - failed handler = - late handler = - late offset = - [[[environment]]] - [[[parameter environment templates]]] - [[[directives]]] - [[[environment filter]]] - exclude = - include = - [[[outputs]]] - [[[simulation]]] - fail try 1 only = True - fail cycle points = - speedup factor = - disable task event handlers = True - default run length = PT10S - time limit buffer = PT30S + submission retry handler = + execution timeout handler = + submission timeout handler = + custom handler = [[[suite state polling]]] - interval = + user = host = + interval = max-polls = message = run-dir = - user = verbose mode = - [[[remote]]] - owner = - suite definition directory = - host = - retrieve job logs = - retrieve job logs max size = - retrieve job logs retry delays = - [[[job]]] - batch submit command template = - batch system = background - submission retry delays = - execution retry delays = - submission polling intervals = - execution polling intervals = - execution time limit = -[[var_s1]] + [[[environment]]] + [[[outputs]]] + [[[parameter environment templates]]] +[[ops_p2]] + script = echo "RUN: run-ops.sh" + inherit = OPS, PARALLEL + execution polling intervals = + execution retry delays = + execution time limit = platform = - script = echo "RUN: run-var.sh" + init-script = env-script = err-script = exit-script = - extra log files = - work sub-directory = - init-script = pre-script = + submission polling intervals = + submission retry delays = post-script = - inherit = VAR, SERIAL + extra log files = + work sub-directory = + [[[directives]]] + job_type = parallel [[[meta]]] title = description = URL = + [[[simulation]]] + default run length = PT10S + speedup factor = + time limit buffer = PT30S + fail cycle points = + fail try 1 only = True + disable task event handlers = True + [[[environment filter]]] + include = + exclude = + [[[job]]] + batch system = background + batch submit command template = + [[[remote]]] + host = + owner = + suite definition directory = + retrieve job logs = + retrieve job logs max size = + retrieve job logs retry delays = [[[events]]] - handler events = - mail smtp = + execution timeout = handlers = + handler events = + handler retry delays = mail events = + mail from = mail retry delays = - handler retry delays = + mail smtp = mail to = - mail from = - execution timeout = submission timeout = - submission timeout handler = + expired handler = + late offset = + late handler = submitted handler = started handler = - execution timeout handler = - expired handler = + succeeded handler = + failed handler = submission failed handler = - submission retry handler = warning handler = critical handler = - custom handler = - succeeded handler = retry handler = - failed handler = - late handler = - late offset = - [[[environment]]] - [[[parameter environment templates]]] - [[[directives]]] - job_type = serial - [[[environment filter]]] - exclude = - include = - [[[outputs]]] - [[[simulation]]] - fail try 1 only = True - fail cycle points = - speedup factor = - disable task event handlers = True - default run length = PT10S - time limit buffer = PT30S + submission retry handler = + execution timeout handler = + submission timeout handler = + custom handler = [[[suite state polling]]] - interval = + user = host = + interval = max-polls = message = run-dir = - user = verbose mode = - [[[remote]]] - owner = - suite definition directory = - host = - retrieve job logs = - retrieve job logs max size = - retrieve job logs retry delays = - [[[job]]] - batch submit command template = - batch system = background - submission retry delays = - execution retry delays = - submission polling intervals = - execution polling intervals = - execution time limit = -[[SERIAL]] + [[[environment]]] + [[[outputs]]] + [[[parameter environment templates]]] +[[var_s1]] + script = echo "RUN: run-var.sh" + inherit = VAR, SERIAL + execution polling intervals = + execution retry delays = + execution time limit = platform = + init-script = env-script = err-script = exit-script = - script = - extra log files = - work sub-directory = - init-script = pre-script = + submission polling intervals = + submission retry delays = post-script = - inherit = + extra log files = + work sub-directory = + [[[directives]]] + job_type = serial [[[meta]]] title = description = URL = + [[[simulation]]] + default run length = PT10S + speedup factor = + time limit buffer = PT30S + fail cycle points = + fail try 1 only = True + disable task event handlers = True + [[[environment filter]]] + include = + exclude = + [[[job]]] + batch system = background + batch submit command template = + [[[remote]]] + host = + owner = + suite definition directory = + retrieve job logs = + retrieve job logs max size = + retrieve job logs retry delays = [[[events]]] - handler events = - mail smtp = + execution timeout = handlers = + handler events = + handler retry delays = mail events = + mail from = mail retry delays = - handler retry delays = + mail smtp = mail to = - mail from = - execution timeout = submission timeout = - submission timeout handler = + expired handler = + late offset = + late handler = submitted handler = started handler = - execution timeout handler = - expired handler = + succeeded handler = + failed handler = submission failed handler = - submission retry handler = warning handler = critical handler = - custom handler = - succeeded handler = retry handler = - failed handler = - late handler = - late offset = - [[[environment]]] - [[[parameter environment templates]]] - [[[directives]]] - job_type = serial - [[[environment filter]]] - exclude = - include = - [[[outputs]]] - [[[simulation]]] - fail try 1 only = True - fail cycle points = - speedup factor = - disable task event handlers = True - default run length = PT10S - time limit buffer = PT30S + submission retry handler = + execution timeout handler = + submission timeout handler = + custom handler = [[[suite state polling]]] - interval = + user = host = + interval = max-polls = message = run-dir = - user = verbose mode = - [[[remote]]] - owner = - suite definition directory = - host = - retrieve job logs = - retrieve job logs max size = - retrieve job logs retry delays = - [[[job]]] - batch submit command template = - batch system = background - submission retry delays = - execution retry delays = - submission polling intervals = - execution polling intervals = - execution time limit = -[[root]] + [[[environment]]] + [[[outputs]]] + [[[parameter environment templates]]] +[[var_s2]] + script = echo "RUN: run-var.sh" + inherit = VAR, SERIAL + execution polling intervals = + execution retry delays = + execution time limit = platform = + init-script = env-script = err-script = exit-script = - script = - extra log files = - work sub-directory = - init-script = pre-script = + submission polling intervals = + submission retry delays = post-script = - inherit = + extra log files = + work sub-directory = + [[[directives]]] + job_type = serial [[[meta]]] title = description = URL = + [[[simulation]]] + default run length = PT10S + speedup factor = + time limit buffer = PT30S + fail cycle points = + fail try 1 only = True + disable task event handlers = True + [[[environment filter]]] + include = + exclude = + [[[job]]] + batch system = background + batch submit command template = + [[[remote]]] + host = + owner = + suite definition directory = + retrieve job logs = + retrieve job logs max size = + retrieve job logs retry delays = [[[events]]] - handler events = - mail smtp = + execution timeout = handlers = + handler events = + handler retry delays = mail events = + mail from = mail retry delays = - handler retry delays = + mail smtp = mail to = - mail from = - execution timeout = submission timeout = - submission timeout handler = + expired handler = + late offset = + late handler = submitted handler = started handler = - execution timeout handler = - expired handler = + succeeded handler = + failed handler = submission failed handler = - submission retry handler = warning handler = critical handler = - custom handler = - succeeded handler = retry handler = - failed handler = - late handler = - late offset = - [[[environment]]] - [[[parameter environment templates]]] - [[[directives]]] - [[[environment filter]]] - exclude = - include = - [[[outputs]]] - [[[simulation]]] - fail try 1 only = True - fail cycle points = - speedup factor = - disable task event handlers = True - default run length = PT10S - time limit buffer = PT30S + submission retry handler = + execution timeout handler = + submission timeout handler = + custom handler = [[[suite state polling]]] - interval = + user = host = + interval = max-polls = message = run-dir = - user = verbose mode = - [[[remote]]] - owner = - suite definition directory = - host = - retrieve job logs = - retrieve job logs max size = - retrieve job logs retry delays = - [[[job]]] - batch submit command template = - batch system = background - submission retry delays = - execution retry delays = - submission polling intervals = - execution polling intervals = - execution time limit = -[[PARALLEL]] + [[[environment]]] + [[[outputs]]] + [[[parameter environment templates]]] +[[var_p1]] + script = echo "RUN: run-var.sh" + inherit = VAR, PARALLEL + execution polling intervals = + execution retry delays = + execution time limit = platform = + init-script = env-script = err-script = exit-script = - script = - extra log files = - work sub-directory = - init-script = pre-script = + submission polling intervals = + submission retry delays = post-script = - inherit = + extra log files = + work sub-directory = + [[[directives]]] + job_type = parallel [[[meta]]] title = description = URL = + [[[simulation]]] + default run length = PT10S + speedup factor = + time limit buffer = PT30S + fail cycle points = + fail try 1 only = True + disable task event handlers = True + [[[environment filter]]] + include = + exclude = + [[[job]]] + batch system = background + batch submit command template = + [[[remote]]] + host = + owner = + suite definition directory = + retrieve job logs = + retrieve job logs max size = + retrieve job logs retry delays = [[[events]]] - handler events = - mail smtp = + execution timeout = handlers = + handler events = + handler retry delays = mail events = + mail from = mail retry delays = - handler retry delays = + mail smtp = mail to = - mail from = - execution timeout = submission timeout = - submission timeout handler = + expired handler = + late offset = + late handler = submitted handler = started handler = - execution timeout handler = - expired handler = + succeeded handler = + failed handler = submission failed handler = - submission retry handler = warning handler = critical handler = - custom handler = - succeeded handler = retry handler = - failed handler = - late handler = - late offset = - [[[environment]]] - [[[parameter environment templates]]] - [[[directives]]] - job_type = parallel - [[[environment filter]]] - exclude = - include = - [[[outputs]]] - [[[simulation]]] - fail try 1 only = True - fail cycle points = - speedup factor = - disable task event handlers = True - default run length = PT10S - time limit buffer = PT30S + submission retry handler = + execution timeout handler = + submission timeout handler = + custom handler = [[[suite state polling]]] - interval = + user = host = + interval = max-polls = message = run-dir = - user = verbose mode = - [[[remote]]] - owner = - suite definition directory = - host = - retrieve job logs = - retrieve job logs max size = - retrieve job logs retry delays = - [[[job]]] - batch submit command template = - batch system = background - submission retry delays = - execution retry delays = - submission polling intervals = - execution polling intervals = - execution time limit = -[[var_s2]] - platform = + [[[environment]]] + [[[outputs]]] + [[[parameter environment templates]]] +[[var_p2]] script = echo "RUN: run-var.sh" + inherit = VAR, PARALLEL + execution polling intervals = + execution retry delays = + execution time limit = + platform = + init-script = env-script = err-script = exit-script = - extra log files = - work sub-directory = - init-script = pre-script = + submission polling intervals = + submission retry delays = post-script = - inherit = VAR, SERIAL + extra log files = + work sub-directory = + [[[directives]]] + job_type = parallel [[[meta]]] title = description = URL = + [[[simulation]]] + default run length = PT10S + speedup factor = + time limit buffer = PT30S + fail cycle points = + fail try 1 only = True + disable task event handlers = True + [[[environment filter]]] + include = + exclude = + [[[job]]] + batch system = background + batch submit command template = + [[[remote]]] + host = + owner = + suite definition directory = + retrieve job logs = + retrieve job logs max size = + retrieve job logs retry delays = [[[events]]] - handler events = - mail smtp = + execution timeout = handlers = + handler events = + handler retry delays = mail events = + mail from = mail retry delays = - handler retry delays = + mail smtp = mail to = - mail from = - execution timeout = submission timeout = - submission timeout handler = + expired handler = + late offset = + late handler = submitted handler = started handler = - execution timeout handler = - expired handler = + succeeded handler = + failed handler = submission failed handler = - submission retry handler = warning handler = critical handler = - custom handler = - succeeded handler = retry handler = - failed handler = - late handler = - late offset = - [[[environment]]] - [[[parameter environment templates]]] - [[[directives]]] - job_type = serial - [[[environment filter]]] - exclude = - include = - [[[outputs]]] - [[[simulation]]] - fail try 1 only = True - fail cycle points = - speedup factor = - disable task event handlers = True - default run length = PT10S - time limit buffer = PT30S + submission retry handler = + execution timeout handler = + submission timeout handler = + custom handler = [[[suite state polling]]] - interval = + user = host = + interval = max-polls = message = run-dir = - user = verbose mode = - [[[remote]]] - owner = - suite definition directory = - host = - retrieve job logs = - retrieve job logs max size = - retrieve job logs retry delays = - [[[job]]] - batch submit command template = - batch system = background - submission retry delays = - execution retry delays = - submission polling intervals = - execution polling intervals = - execution time limit = + [[[environment]]] + [[[outputs]]] + [[[parameter environment templates]]] diff --git a/tests/deprecations/01-cylc8-basic.t b/tests/deprecations/01-cylc8-basic.t index a8ab9920266..488f7864bca 100755 --- a/tests/deprecations/01-cylc8-basic.t +++ b/tests/deprecations/01-cylc8-basic.t @@ -39,6 +39,11 @@ cmp_ok val.out <<__END__ * (8.0.0) [cylc][reference test][suite shutdown event handler] - DELETED (OBSOLETE) * (8.0.0) [cylc][abort if any task fails] -> [cylc][events][abort if any task fails] - value unchanged * (8.0.0) [runtime][foo, cat, dog][job][shell] - DELETED (OBSOLETE) + * (8.0.0) [runtime][foo, cat, dog][job][execution polling intervals] -> [runtime][foo, cat, dog][execution polling intervals] - value unchanged + * (8.0.0) [runtime][foo, cat, dog][job][execution retry delays] -> [runtime][foo, cat, dog][execution retry delays] - value unchanged + * (8.0.0) [runtime][foo, cat, dog][job][execution time limit] -> [runtime][foo, cat, dog][execution time limit] - value unchanged + * (8.0.0) [runtime][foo, cat, dog][job][submission polling intervals] -> [runtime][foo, cat, dog][submission polling intervals] - value unchanged + * (8.0.0) [runtime][foo, cat, dog][job][submission retry delays] -> [runtime][foo, cat, dog][submission retry delays] - value unchanged __END__ purge_suite "${SUITE_NAME}" diff --git a/tests/deprecations/01-cylc8-basic/suite.rc b/tests/deprecations/01-cylc8-basic/suite.rc index e941ff78ce1..a5997b2a7e9 100644 --- a/tests/deprecations/01-cylc8-basic/suite.rc +++ b/tests/deprecations/01-cylc8-basic/suite.rc @@ -13,7 +13,6 @@ required run mode = suite shutdown event handler = - [scheduling] initial cycle point = 20150808T00 final cycle point = 20150808T00 @@ -24,5 +23,8 @@ [[foo, cat, dog]] [[[job]]] shell = fish - - + execution polling intervals = + execution retry delays = + execution time limit = + submission polling intervals = + submission retry delays = diff --git a/tests/events/09-task-event-mail/suite.rc b/tests/events/09-task-event-mail/suite.rc index 4f0db7d794f..6af5aa6f3bd 100644 --- a/tests/events/09-task-event-mail/suite.rc +++ b/tests/events/09-task-event-mail/suite.rc @@ -15,8 +15,7 @@ [runtime] [[t1]] script=test "${CYLC_TASK_TRY_NUMBER}" -eq 2 - [[[job]]] - execution retry delays = PT5S + execution retry delays = PT5S {% if GLOBALCFG is not defined %} [[[events]]] mail events = failed, retry, succeeded diff --git a/tests/events/10-task-event-job-logs-retrieve/suite.rc b/tests/events/10-task-event-job-logs-retrieve/suite.rc index c46da35d4ce..0848c023264 100644 --- a/tests/events/10-task-event-job-logs-retrieve/suite.rc +++ b/tests/events/10-task-event-job-logs-retrieve/suite.rc @@ -9,8 +9,7 @@ [runtime] [[t1]] script=test "${CYLC_TASK_TRY_NUMBER}" -eq 3 - [[[job]]] - execution retry delays=PT0S, 2*PT1S + execution retry delays=PT0S, 2*PT1S [[[remote]]] host = {{HOST}} {% if GLOBALCFG is not defined %} diff --git a/tests/events/11-cycle-task-event-job-logs-retrieve/suite.rc b/tests/events/11-cycle-task-event-job-logs-retrieve/suite.rc index 381c6de1e9e..2e58d878c12 100644 --- a/tests/events/11-cycle-task-event-job-logs-retrieve/suite.rc +++ b/tests/events/11-cycle-task-event-job-logs-retrieve/suite.rc @@ -15,8 +15,7 @@ [runtime] [[T]] script=test "${CYLC_TASK_TRY_NUMBER}" -eq 3 - [[[job]]] - execution retry delays=PT0S, 2*PT1S + execution retry delays=PT0S, 2*PT1S [[[remote]]] host = {{HOST}} [[t1]] diff --git a/tests/events/29-task-event-mail-1/suite.rc b/tests/events/29-task-event-mail-1/suite.rc index db6ea2bea11..584cb96c281 100644 --- a/tests/events/29-task-event-mail-1/suite.rc +++ b/tests/events/29-task-event-mail-1/suite.rc @@ -13,8 +13,7 @@ [runtime] [[t1]] script=test "${CYLC_TASK_TRY_NUMBER}" -eq 2 - [[[job]]] - execution retry delays = PT1S + execution retry delays = PT1S [[[events]]] mail events = failed, retry mail smtp = {{MAIL_SMTP}} diff --git a/tests/events/30-task-event-mail-2/suite.rc b/tests/events/30-task-event-mail-2/suite.rc index ef9ed240f16..aa311090d30 100644 --- a/tests/events/30-task-event-mail-2/suite.rc +++ b/tests/events/30-task-event-mail-2/suite.rc @@ -18,8 +18,7 @@ [runtime] [[t1, t2, t3, t4, t5]] script=false - [[[job]]] - execution retry delays = 2*PT20S + execution retry delays = 2*PT20S [[[events]]] mail events = failed, retry mail smtp = {{MAIL_SMTP}} diff --git a/tests/execution-time-limit/02-slurm/suite.rc b/tests/execution-time-limit/02-slurm/suite.rc index d38a7f58120..d9ca9a5d0cc 100644 --- a/tests/execution-time-limit/02-slurm/suite.rc +++ b/tests/execution-time-limit/02-slurm/suite.rc @@ -10,12 +10,12 @@ if [[ "${CYLC_TASK_SUBMIT_NUMBER}" == '1' ]]; then sleep 300 fi """ + execution time limit = PT70S + execution retry delays = PT0S [[[remote]]] host={{CYLC_TEST_BATCH_TASK_HOST}} [[[job]]] batch system = {{CYLC_TEST_BATCH_SYS}} - execution time limit = PT70S - execution retry delays = PT0S [[[directives]]] {{CYLC_TEST_BATCH_SITE_DIRECTIVES}} diff --git a/tests/hold-release/11-retrying/suite.rc b/tests/hold-release/11-retrying/suite.rc index 849a3a8ddc4..cfb4cc4461f 100644 --- a/tests/hold-release/11-retrying/suite.rc +++ b/tests/hold-release/11-retrying/suite.rc @@ -13,8 +13,7 @@ t-retry-able => t-analyse # Note under bash 4.2 failed bare arithmetic tests such as # "(( VAR >= 3 ))" do not cause an abort under 'set -e'. script = test "${CYLC_TASK_TRY_NUMBER}" -ge 3 - [[[job]]] - execution retry delays = PT15S, 2*PT1S + execution retry delays = PT15S, 2*PT1S [[t-hold-release]] script = """ cylc__job__poll_grep_suite_log -F \ diff --git a/tests/hold-release/12-hold-then-retry/suite.rc b/tests/hold-release/12-hold-then-retry/suite.rc index d87a81dffd0..e873413aa08 100644 --- a/tests/hold-release/12-hold-then-retry/suite.rc +++ b/tests/hold-release/12-hold-then-retry/suite.rc @@ -45,8 +45,7 @@ t-submit-retry-able:submit => t-hold false fi """ - [[[job]]] - execution retry delays = PT5S + execution retry delays = PT5S [[t-submit-retry-able]] env-script = """ if ((CYLC_TASK_SUBMIT_NUMBER == 1)); then diff --git a/tests/job-submission/01-job-nn-localhost/suite.rc b/tests/job-submission/01-job-nn-localhost/suite.rc index 21203b55a2a..a24355ecfd5 100644 --- a/tests/job-submission/01-job-nn-localhost/suite.rc +++ b/tests/job-submission/01-job-nn-localhost/suite.rc @@ -20,5 +20,4 @@ NN_VALUE="$(readlink "${JOB_LOG_DIR}/NN")" test "${CYLC_TASK_SUBMIT_NUMBER}" -eq "100" test "${NN_VALUE}" -eq "100" """ - [[[job]]] - execution retry delays=99*PT0S + execution retry delays=99*PT0S diff --git a/tests/job-submission/04-submit-num/suite.rc b/tests/job-submission/04-submit-num/suite.rc index da9fa2d9ccd..e79ac947438 100644 --- a/tests/job-submission/04-submit-num/suite.rc +++ b/tests/job-submission/04-submit-num/suite.rc @@ -16,8 +16,7 @@ echo "${CYLC_TASK_SUBMIT_NUMBER}" >>"${CYLC_SUITE_RUN_DIR}/foo-submits.txt" # bash 4.2.0 bug: ((VAR == VAL)) does not trigger 'set -e': test "${CYLC_TASK_SUBMIT_NUMBER}" -gt "${CYLC_TASK_TRY_NUMBER}" """ - [[[job]]] - execution retry delays=2*PT0S + execution retry delays=2*PT0S [[bar]] script = """ cylc trigger "${CYLC_SUITE_NAME}" foo 1 diff --git a/tests/job-submission/08-activity-log-host/suite.rc b/tests/job-submission/08-activity-log-host/suite.rc index 551db056a3f..045f16b2166 100644 --- a/tests/job-submission/08-activity-log-host/suite.rc +++ b/tests/job-submission/08-activity-log-host/suite.rc @@ -10,8 +10,7 @@ [runtime] [[sleeper]] script = test "${CYLC_TASK_SUBMIT_NUMBER}" -eq 2 || sleep 60 - [[[job]]] - execution retry delays = PT1S + execution retry delays = PT1S [[[remote]]] host = {{CYLC_TEST_HOST}} [[killer]] diff --git a/tests/job-submission/12-tidy-submits-of-prev-run/suite.rc b/tests/job-submission/12-tidy-submits-of-prev-run/suite.rc index 41d8b7f2205..7e90c4a32e0 100644 --- a/tests/job-submission/12-tidy-submits-of-prev-run/suite.rc +++ b/tests/job-submission/12-tidy-submits-of-prev-run/suite.rc @@ -6,8 +6,7 @@ [runtime] [[t1]] script = test "${CYLC_TASK_SUBMIT_NUMBER}" -eq 2 - [[[job]]] - execution retry delays = P0Y + execution retry delays = P0Y {% if CYLC_TEST_HOST is defined %} [[[remote]]] host = {{CYLC_TEST_HOST}} diff --git a/tests/job-submission/15-garbage-host-command-2/suite.rc b/tests/job-submission/15-garbage-host-command-2/suite.rc index 9afebae48ef..c16134348b6 100644 --- a/tests/job-submission/15-garbage-host-command-2/suite.rc +++ b/tests/job-submission/15-garbage-host-command-2/suite.rc @@ -7,7 +7,6 @@ [runtime] [[foo]] script = true - [[[job]]] - submission retry delays = PT10S + submission retry delays = PT10S [[[remote]]] host = $(my-host-select) diff --git a/tests/job-submission/17-remote-localtime/suite.rc b/tests/job-submission/17-remote-localtime/suite.rc index 57e940bf9d8..48ca5be8595 100644 --- a/tests/job-submission/17-remote-localtime/suite.rc +++ b/tests/job-submission/17-remote-localtime/suite.rc @@ -9,7 +9,6 @@ [runtime] [[t1]] script=test -z "${TZ:-}" - [[[job]]] - execution time limit = PT1M + execution time limit = PT1M [[[remote]]] host={{environ["CYLC_TEST_HOST"]}} diff --git a/tests/jobscript/05-global-config.t b/tests/jobscript/05-global-config.t index 270a8e9037c..b2417f97299 100755 --- a/tests/jobscript/05-global-config.t +++ b/tests/jobscript/05-global-config.t @@ -17,6 +17,9 @@ #------------------------------------------------------------------------------- # Test that global config is used search for poll . "$(dirname "${0}")/test_header" + +# TODO - replace this with a Cylc 8 test +skip_all "This test is broken pending full implementation of platforms" #------------------------------------------------------------------------------- set_test_number 6 install_suite "${TEST_NAME_BASE}" "${TEST_NAME_BASE}" diff --git a/tests/jobscript/05-global-config/suite.rc b/tests/jobscript/05-global-config/suite.rc index ebcee71dacb..2b911cc7351 100644 --- a/tests/jobscript/05-global-config/suite.rc +++ b/tests/jobscript/05-global-config/suite.rc @@ -11,8 +11,8 @@ communication method""" [[foo]] [[bar]] script = "sleep 10" + submission polling intervals = PT0.1M + execution polling intervals = PT0.3M, 2*PT0.2M, PT0.1M [[[job]]] batch system = at batch submit command template = at now + 1 minutes - submission polling intervals = PT0.1M - execution polling intervals = PT0.3M, 2*PT0.2M, PT0.1M diff --git a/tests/jobscript/12-err-script/suite.rc b/tests/jobscript/12-err-script/suite.rc index d9b00064ec7..ae08fb0437f 100644 --- a/tests/jobscript/12-err-script/suite.rc +++ b/tests/jobscript/12-err-script/suite.rc @@ -8,9 +8,8 @@ R1 = foo [runtime] [[foo]] + execution retry delays = PT0S err-script = echo "$1 ${FOO}" script = test "${CYLC_TASK_SUBMIT_NUMBER}" -ge 2 [[[environment]]] FOO = foo bar baz qux - [[[job]]] - execution retry delays = PT0S diff --git a/tests/jobscript/14-sge-format/suite.rc b/tests/jobscript/14-sge-format/suite.rc index dff8bdc1ec7..4b45e717a99 100644 --- a/tests/jobscript/14-sge-format/suite.rc +++ b/tests/jobscript/14-sge-format/suite.rc @@ -5,9 +5,9 @@ R1 = foo [runtime] [[foo]] + execution time limit = PT10M [[[job]]] batch system = sge - execution time limit = PT10M [[[directives]]] -V = -q = queuename diff --git a/tests/jobscript/15-semicolon/suite.rc b/tests/jobscript/15-semicolon/suite.rc index f5884100830..c92f3d074e1 100644 --- a/tests/jobscript/15-semicolon/suite.rc +++ b/tests/jobscript/15-semicolon/suite.rc @@ -13,5 +13,4 @@ if ((${CYLC_TASK_SUBMIT_NUMBER} == 1)); then false; true fi """ - [[[job]]] - execution retry delays = PT0S + execution retry delays = PT0S diff --git a/tests/jobscript/16-midfail/suite.rc b/tests/jobscript/16-midfail/suite.rc index 27b50625d1f..739f435ae7e 100644 --- a/tests/jobscript/16-midfail/suite.rc +++ b/tests/jobscript/16-midfail/suite.rc @@ -14,5 +14,4 @@ if ((${CYLC_TASK_SUBMIT_NUMBER} == 1)); then true fi """ - [[[job]]] - execution retry delays = PT0S + execution retry delays = PT0S diff --git a/tests/reload/11-retrying/suite.rc b/tests/reload/11-retrying/suite.rc index a90b3c4c85e..16b9d50081c 100644 --- a/tests/reload/11-retrying/suite.rc +++ b/tests/reload/11-retrying/suite.rc @@ -16,8 +16,7 @@ if ((CYLC_TASK_TRY_NUMBER == 1)); then sleep 120 # Does not matter how long as the job will be killed fi """ - [[[job]]] - execution retry delays = PT0S + execution retry delays = PT0S [[reloader]] script = """ cylc__job__poll_grep_suite_log -F '[retrier.1] -running (held) => retrying (held)' diff --git a/tests/restart/03-retrying.t b/tests/restart/03-retrying.t index f0c943cb17e..6c341fb0242 100755 --- a/tests/restart/03-retrying.t +++ b/tests/restart/03-retrying.t @@ -36,8 +36,7 @@ init_suite "${TEST_NAME_BASE}" <<'__SUITERC__' exit 1 fi """ - [[[job]]] - execution retry delays = PT0S + execution retry delays = PT0S __SUITERC__ #------------------------------------------------------------------------------- run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}" diff --git a/tests/restart/23-hold-retry/suite.rc b/tests/restart/23-hold-retry/suite.rc index 3b77d388907..061791f870f 100644 --- a/tests/restart/23-hold-retry/suite.rc +++ b/tests/restart/23-hold-retry/suite.rc @@ -15,5 +15,4 @@ if ((CYLC_TASK_TRY_NUMBER == 1)); then sleep 120 # Should not matter because the job will be killed fi """ - [[[job]]] - execution retry delays = PT0S + execution retry delays = PT0S diff --git a/tests/retries/execution/suite.rc b/tests/retries/execution/suite.rc index 2fc8c155c0e..9f2469fdf29 100644 --- a/tests/retries/execution/suite.rc +++ b/tests/retries/execution/suite.rc @@ -9,5 +9,4 @@ [runtime] [[foo]] script = test "${CYLC_TASK_TRY_NUMBER}" '-ge' '4' - [[[job]]] - execution retry delays = 3*PT0S + execution retry delays = 3*PT0S diff --git a/tests/validate/23-fail-old-syntax-7/suite.rc b/tests/validate/23-fail-old-syntax-7/suite.rc index 174841bc849..67863ca5701 100644 --- a/tests/validate/23-fail-old-syntax-7/suite.rc +++ b/tests/validate/23-fail-old-syntax-7/suite.rc @@ -9,5 +9,4 @@ [runtime] [[A]] script = "sleep 10" - [[[job]]] - execution retry delays = 2*PT30M, PT60M + execution retry delays = 2*PT30M, PT60M