diff --git a/ChangeLog.txt b/ChangeLog.txt index 1a071ba..003a74b 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,8 @@ ** Release Notes +1.5.80 + * added framework option to prun and pathena + 1.5.79 * added option name check in pbook.retry diff --git a/pandaclient/PathenaScript.py b/pandaclient/PathenaScript.py index d6e3970..26ec15e 100644 --- a/pandaclient/PathenaScript.py +++ b/pandaclient/PathenaScript.py @@ -936,6 +936,13 @@ default=False, help="Don't submit jobs", ) +group_submit.add_argument( + "--framework", + action="store", + dest="framework", + default="", + help="set framework used for task submission", +) group_submit.add_argument( "--prodSourceLabel", action="store", @@ -2378,6 +2385,8 @@ def _onExit(dir, files, del_command): taskParamMap["waitInput"] = 1 if options.goodRunListXML != "": taskParamMap["processingType"] += "-grl" +if options.framework != "": + taskParamMap["framework"] = options.framework if options.prodSourceLabel == "": taskParamMap["prodSourceLabel"] = "user" else: diff --git a/pandaclient/PrunScript.py b/pandaclient/PrunScript.py index 5ce9a56..18c1a05 100644 --- a/pandaclient/PrunScript.py +++ b/pandaclient/PrunScript.py @@ -713,6 +713,13 @@ def main(get_taskparams=False, ext_args=None, dry_mode=False, get_options=False) default=False, help="Don't submit jobs", ) + group_submit.add_argument( + "--framework", + action="store", + dest="framework", + default="", + help="set framework used for task submission", + ) group_submit.add_argument( "--prodSourceLabel", action="store", @@ -2133,6 +2140,8 @@ def _onExit(dir, files, del_command): taskParamMap["waitInput"] = 1 if options.goodRunListXML != "": taskParamMap["processingType"] += "-grl" + if options.framework != "": + taskParamMap["framework"] = options.framework if options.prodSourceLabel == "": taskParamMap["prodSourceLabel"] = "user" else: