Merge pull request #38 from PanDAWMS/framework

Added framework option to prun and pathena
PanDAWMS · Nov 18, 2024 · 50eb80c · 50eb80c
2 parents 24d4379 + 10adba6
commit 50eb80c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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: