[cli/oarsub] better error when AR fail

etc/oar/admission_rules.d/02_prevent_root_oar_toSubmit.py

@@ -1,5 +1,3 @@
 # Prevent root and oar to submit jobs.
 if (user == "root") or (user == "oar"):
-    raise Exception(
-        "# ADMISSION RULE> root and oar users are not allowed to submit jobs."
-    )
+    raise Exception("root and oar users are not allowed to submit jobs.")

etc/oar/admission_rules.d/04_submit_in_admin_queue.py

@@ -5,7 +5,7 @@
 
     if user not in grp.getgrnam(admin_group).gr_mem:
         raise Exception(
-            "# ADMISSION RULE> Only member of the group {} can submit jobs in the admin queue".format(
+            "Only member of the group {} can submit jobs in the admin queue".format(
                 admin_group
             )
         )

oar/cli/oarsub.py

@@ -664,7 +664,11 @@ def qdel(signalnum, frame):  # pragma: no cover
     # Launch the checked submission
     (error, job_id_lst) = submission.submit(session, config)
 
-    if error[0] != 0:
+    # Admission rule failed
+    if error[0] == -2:
+        cmd_ret.print_(f"# ADMISSION RULE> {error[1]}")
+        cmd_ret.exit(1)
+    elif error[0] != 0:
         cmd_ret.error("unamed error", 0, error)  # TODO
         cmd_ret.exit()
 

oar/lib/submission.py

@@ -1080,8 +1080,9 @@ def add_micheline_jobs(
     if ("ADMISSION_RULES_IN_FILES" in config) and (
         config["ADMISSION_RULES_IN_FILES"] == "yes"
     ):
+
         # Read admission_rules from files
-        rules_dir = "/etc/oar/admission_rules.d/"
+        rules_dir = config.get("ADMISSION_RULES_PATH", "/etc/oar/admission_rules.d/")
         file_names = os.listdir(rules_dir)
 
         file_names.sort()
@@ -1114,7 +1115,7 @@ def add_micheline_jobs(
         err = sys.exc_info()
         error = (
             -2,
-            str(err[1]) + ", a failed admission rule prevented submitting the job.",
+            f"A failed admission rule prevented submitting the job: {err[1]}.",
         )
         return (error, [])
 

tests/cli/test_oarsub.py

@@ -646,13 +646,32 @@ def test_oarsub_reservation_granted(
         ["--reservation", "1970-01-01 01:20:00"],
         obj=(minimal_db_initialization, config),
     )
-    print(result.output)
-    print(result.output.split("\n")[3])
+    print(f"{result.output} \n fin")
 
     assert re.match(r".*GRANTED.*", result.output.split("\n")[3])
     assert result.exit_code == 0
 
 
+def test_oarsub_fail_ar(monkeypatch, minimal_db_initialization, setup_config):
+    config, _, _ = setup_config
+    AdmissionRule.create(
+        minimal_db_initialization,
+        rule="""raise Exception(
+                    "try again"
+                )""",
+    )
+    runner = CliRunner()
+    result = runner.invoke(
+        cli,
+        ["-q default", '"sleep 1"'],
+        obj=(minimal_db_initialization, config),
+        catch_exceptions=False,
+    )
+
+    print(result.output)
+    assert result.exit_code == 1
+
+
 def test_oarsub_array_index(monkeypatch, minimal_db_initialization, setup_config):
     config, _, _ = setup_config
     runner = CliRunner()