Merge pull request #6195 from grondo/cli-bank

add `-B, --bank=` option to submission commands

Author: mergify[bot]

doc/man1/common/job-param-additional.rst

@@ -6,6 +6,15 @@
    option is ignored, though :man1:`flux-jobs` may display the queue
    name in its rendering of the ``{queue}`` attribute.
 
+.. option:: -B, --bank=NAME
+
+   Set the bank name for this job to ``NAME``. This option is equivalent
+   to `--setattr=bank=NAME`, and results in the ``bank`` attribute being
+   set to ``NAME`` in the submitted jobspec. However, besides the bank
+   name appearing in job listing output, this option may have no effect
+   if no plugin or package that supports it (such as flux-accounting)
+   is installed and configured.
+
 .. option:: -t, --time-limit=MINUTES|FSD
 
    Set a time limit for the job in either minutes or Flux standard duration

etc/completions/flux.pre

@@ -375,6 +375,7 @@ _flux_submit_commands()
 
     local COMMON_OPTIONS="\
         -q --queue= \
+        -B --bank= \
         -t --time-limit= \
         -o --setopt= \
         --setattr= \

src/bindings/python/flux/cli/base.py

@@ -505,6 +505,7 @@ class Xcmd:
     #  the string representation of an Xcmd object.
     mutable_args = {
         "queue": "-q",
+        "bank": "-B",
         "ntasks": "-n",
         "nodes": "-N",
         "cores_per_task": "-c",
@@ -757,6 +758,13 @@ def create_parser(
             description=description,
             formatter_class=flux.util.help_formatter(),
         )
+        parser.add_argument(
+            "-B",
+            "--bank",
+            type=str,
+            metavar="BANK",
+            help="Submit a job to a specific named bank",
+        )
         parser.add_argument(
             "-q",
             "--queue",
@@ -1042,6 +1050,9 @@ def jobspec_create(self, args):
         if args.queue is not None:
             jobspec.setattr("system.queue", args.queue)
 
+        if args.bank is not None:
+            jobspec.setattr("system.bank", args.bank)
+
         if args.setattr is not None:
             for keyval in args.setattr:
                 key, val = parse_jobspec_keyval("--setattr", keyval)
@@ -1425,7 +1436,6 @@ def _progress_check(self, args):
             args.progress = None
 
     def watcher_start(self, args):
-
         if not self.watcher:
             #  Need to open self.flux_handle if it isn't already in order
             #  to start the watcher

t/t2710-python-cli-submit.t

@@ -94,7 +94,14 @@ test_expect_success 'flux submit --queue works' '
 test_expect_success 'flux submit --queue works' '
 	flux submit --env=-* --dry-run -q debug hostname >queue2.out && grep -i "debug" queue2.out
 '
-
+test_expect_success 'flux submit --bank works' '
+	flux submit --env=-* --dry-run --bank=mybank hostname >bank.out &&
+	grep -i "mybank" bank.out
+'
+test_expect_success 'flux submit -B works' '
+	flux submit --env=-* --dry-run -B mybank2 hostname >bank2.out &&
+	grep -i "mybank2" bank2.out
+'
 test_expect_success 'flux submit --setattr works' '
 	flux submit --env=-* --dry-run \
 		--setattr user.meep=false \