Merge pull request #2081 from garlick/relax_jobspec_attrs

jobspec: allow non-string attributes
flux-framework · Mar 18, 2019 · 0afdf79 · 0afdf79
2 parents aedccca + 23565b3
commit 0afdf79
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 8 deletions.
diff --git a/src/modules/job-ingest/schemas/jobspec.jsonschema b/src/modules/job-ingest/schemas/jobspec.jsonschema
@@ -99,12 +99,10 @@
           "type": "object",
           "properties": {
             "duration": { "type": "string" }
-          },
-          "additonalProperties": { "type": "string" }
+          }
         },
         "user": {
-          "type": "object",
-          "additonalProperties": { "type": "string" }
+          "type": "object"
         }
       },
       "additionalProperties": false

diff --git a/t/jobspec/minimal-schema.json b/t/jobspec/minimal-schema.json
@@ -91,9 +91,11 @@
           "type": "object",
           "properties": {
             "duration": { "type": "string" }
-          },
-          "additonalProperties": { "type": "string" }
-        }
+          }
+        },
+	"user": {
+          "type": "object"
+	}
       },
       "additionalProperties": false
     },

diff --git a/t/jobspec/valid/attributes_system.yaml b/t/jobspec/valid/attributes_system.yaml
@@ -0,0 +1,20 @@
+version: 1
+resources:
+  - type: slot
+    count: 1
+    label: foo
+    with:
+      - type: node
+        count: 1
+tasks:
+  - command: app
+    slot: foo
+    count:
+      per_slot: 1
+attributes:
+  system:
+    a: "string"
+    b: 42
+    c: [ 1, 2, 3 ]
+    d:
+    foo: "string"
diff --git a/t/jobspec/valid/attributes_user.yaml b/t/jobspec/valid/attributes_user.yaml
@@ -0,0 +1,20 @@
+version: 1
+resources:
+  - type: slot
+    count: 1
+    label: foo
+    with:
+      - type: node
+        count: 1
+tasks:
+  - command: app
+    slot: foo
+    count:
+      per_slot: 1
+attributes:
+  user:
+    a: "string"
+    b: 42
+    c: [ 1, 2, 3 ]
+    d:
+    foo: "string"
diff --git a/t/t2200-job-ingest.t b/t/t2200-job-ingest.t
@@ -26,7 +26,7 @@ test_valid ()
 {
     local rc=0
     for job in $*; do
-        cat ${job} | ${Y2J} | ${SUBMITBENCH} -
+        cat ${job} | ${Y2J} | ${SUBMITBENCH} - || rc=1
     done
     return ${rc}
 }