rfc27: update examples to meet Jobspec V2 specification

Author: SteVwonder

Makefile

@@ -9,7 +9,7 @@ SOURCEDIR     = .
 BUILDDIR      = _build
 
 # YAML Validation on these directories
-SCHEMA_DIRS=data/spec_26 data/spec_14
+SCHEMA_DIRS=data/spec_27 data/spec_26 data/spec_14
 
 # Put it first so that "make" without argument is like "make help".
 help:

data/spec_27/example1.yaml

@@ -1,4 +1,4 @@
-version: 1
+version: 2
 resources:
   - type: node
     count: 4

data/spec_27/schema.json

@@ -1,9 +1,9 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "http://github.com/flux-framework/rfc/tree/master/data/spec_14/schema.json",
-  "title": "canonical-jobspec",
+  "$id": "http://github.com/flux-framework/rfc/tree/master/data/spec_27/schema.json",
+  "title": "jobspec-02",
 
-  "description":         "Flux canonical jobspec",
+  "description":         "Flux jobspec version 2",
 
   "definitions": {
     "complex_range": {
@@ -38,7 +38,9 @@
         "exclusive": { "type": "boolean" },
         "with": {
           "type": "array",
-          "items": { "$ref": "#/definitions/resource_vertex" }
+          "items": { "$ref": "#/definitions/resource_vertex" },
+          "minItems": 1,
+          "maxItems": 2
         },
         "id": { "type": "string" },
         "unit": { "type": "string" },
@@ -64,7 +66,7 @@
         { "$ref": "#/definitions/resource_vertex_base" },
         {
           "properties": {
-            "type": { "not": { "enum": ["slot"] } }
+              "type": { "enum": ["node", "gpu", "core"] }
           }
         }
       ]
@@ -82,12 +84,14 @@
   "properties": {
     "version": {
       "description": "the jobspec version",
-      "type": "integer"
+      "type": "integer",
+      "enum": [2]
     },
     "resources": {
       "description": "requested resources",
       "type": "array",
       "minItems": 1,
+      "maxItems": 1,
       "items": { "$ref": "#/definitions/resource_vertex" }
     },
     "attributes": {
@@ -128,7 +132,17 @@
             "type": "object",
             "properties": {
               "per_slot": { "type": "integer", "minimum" : 1 },
-              "total": { "type": "integer", "minimum" : 1 }
+                "total": { "type": "integer", "minimum" : 1 },
+                "per_resource": { "type": "object",
+                                  "required": ["type", "count"],
+                                  "properties": {
+                                      "type": {"type": "string"},
+                                      "count": {
+                                          "type": "integer",
+                                          "mininum" : 1
+                                      }
+                                  }
+                                }
             }
           },
           "distribution": { "type": "string" },

data/spec_27/use_case_1.1.yaml

@@ -1,4 +1,4 @@
-version: 1
+version: 2
 resources:
   - type: node
     count: 4

data/spec_27/use_case_2.1.yaml

@@ -1,4 +1,4 @@
-version: 1
+version: 2
 resources:
   - type: node
     count: 4

data/spec_27/use_case_2.2.yaml

@@ -1,4 +1,4 @@
-version: 1
+version: 2
 resources:
   - type: slot
     label: default

data/spec_27/use_case_2.3.yaml

@@ -1,4 +1,4 @@
-version: 1
+version: 2
 resources:
   - type: slot
     count: 10

data/spec_27/use_case_2.4.yaml

@@ -1,4 +1,4 @@
-version: 1
+version: 2
 resources:
   - type: node
     count: 4