From 467ae2773489cba9dd885f0c0e8d0a1d73f47d88 Mon Sep 17 00:00:00 2001 From: Olivier Richard Date: Fri, 28 Jun 2024 11:23:07 +0200 Subject: [PATCH] [admission rules] add noop, wrapper and wrapped jot types in checking rules --- etc/oar/admission_rules.d/15_check_types.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etc/oar/admission_rules.d/15_check_types.py b/etc/oar/admission_rules.d/15_check_types.py index 0f219fce..17664932 100644 --- a/etc/oar/admission_rules.d/15_check_types.py +++ b/etc/oar/admission_rules.d/15_check_types.py @@ -9,8 +9,11 @@ r8 = "^allowed=\\w+$" r9 = "^inner=\\w+$" r10 = "^timesharing=(?:(?:\\*|user),(?:\\*|name)|(?:\\*|name),(?:\\*|user))$" + r11 = "^noop(?:=standby)?$" + r12 = "^wrapper$" + r13 = "^wrapped=\\w+$" all_re = re.compile( - "(%s|%s|%s|%s|%s|%s|%s|%s|%s|%s)" % (r1, r2, r3, r4, r5, r6, r7, r8, r9, r10) + "(%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s|%s)" % (r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11, r12, r13) ) for t in types: