Merge pull request #6 from compspec/add/scripts

update jobspec for experimental types

Makefile

@@ -49,7 +49,7 @@ exp2: build
 	$(COMMONENVVAR) $(BUILDENVVAR) go build -ldflags '-w' -o ./examples/experimental/bin/example2 examples/experimental/example2/example.go
 
 .PHONY: test
-test:
+test: all
 	./examples/v1/bin/example1
 	./examples/v1/bin/example2
 	./examples/v1/bin/example3

examples/experimental/example1/example.go

@@ -12,7 +12,7 @@ func main() {
 	fmt.Println("This example reads, parses, and validates a Jobspec")
 
 	// Assumes running from the root
-	fileName := flag.String("json", "examples/v1/example1/jobspec.yaml", "yaml file")
+	fileName := flag.String("json", "examples/experimental/example1/jobspec.yaml", "yaml file")
 	flag.Parse()
 
 	yamlFile := *fileName

examples/experimental/example1/jobspec.yaml

@@ -9,8 +9,9 @@ resources:
         with:
           - type: core
             count: 2
-tasks:
-- command:
+task:
+  slot: "default"
+  command:
   - ior
   count:
     per_slot: 1

examples/experimental/example2/example.go

@@ -12,7 +12,7 @@ func main() {
 	fmt.Println("This example reads, parses, and validates a Jobspec")
 
 	// Assumes running from the root
-	fileName := flag.String("json", "examples/v1/example2/jobspec.yaml", "yaml file")
+	fileName := flag.String("json", "examples/experimental/example2/jobspec.yaml", "yaml file")
 	flag.Parse()
 
 	yamlFile := *fileName

examples/experimental/example2/jobspec.yaml

@@ -9,26 +9,29 @@ resources:
         with:
           - type: core
             count: 2
-tasks:
-- count:
+task:
+  slot: "default"
+  count:
     per_slot: 1
-  script: |
-    #!/bin/bash
-    start_fractal() {
-      sleep 5
-      curl -X POST http://localhost:9092/start       
-     }
-     echo "This is task \${FLUX_TASK_RANK}"
-     if [[ "\${FLUX_TASK_RANK}" == "0" ]]; then
-       start_fractal &
-       fractal leader --host 0.0.0.0:50051 --force-exit
-     else
-       fractal worker --host flux-sample-0.flux-service.default.svc.cluster.local:50051
-     fi    
+  scripts: 
+    - name: "job.sh"
+      content: |
+        #!/bin/bash
+        start_fractal() {
+          sleep 5
+          curl -X POST http://localhost:9092/start       
+         }
+         echo "This is task \${FLUX_TASK_RANK}"
+         if [[ "\${FLUX_TASK_RANK}" == "0" ]]; then
+           start_fractal &
+           fractal leader --host 0.0.0.0:50051 --force-exit
+         else
+           fractal worker --host flux-sample-0.flux-service.default.svc.cluster.local:50051
+         fi    
   resources:
     io:
       storage:
       - priority: 1
         storage: mtl2unit
       - priority: 2
-        storage: shm
+        storage: shm

pkg/jobspec/experimental/convert.go

@@ -50,12 +50,11 @@ func NewSimpleJobspec(name, command string, nodes, tasks int32) (*Jobspec, error
 	// Tasks reference the slot and command
 	// Note: if we need better split can use "github.com/google/shlex"
 	cmd := strings.Split(command, " ")
-	taskResource := []Tasks{
-		{
-			Command: cmd,
-			Slot:    name,
-			Count:   Count{PerSlot: int32(1)},
-		}}
+	taskResource := Task{
+		Command: cmd,
+		Slot:    name,
+		Count:   Count{PerSlot: int32(1)},
+	}
 
 	// Attributes are for the system, we aren't going to add them yet
 	// attributes:
@@ -68,6 +67,6 @@ func NewSimpleJobspec(name, command string, nodes, tasks int32) (*Jobspec, error
 	return &Jobspec{
 		Version:   jobspecVersion,
 		Resources: []Resource{nodeResource},
-		Tasks:     taskResource,
+		Task:      taskResource,
 	}, nil
 }

pkg/jobspec/experimental/jobspec.go

@@ -64,13 +64,9 @@ func (js *Jobspec) GetJobName() string {
 	// If we have tasks, we can get from the command
 	// This entire set of checks is meant to be conservative
 	// and avoid any errors with nil / empty arrays, etc.
-	if js.Tasks != nil {
-		if len(js.Tasks) > 0 {
-			command := js.Tasks[0].Command
-			if len(command) > 0 {
-				name = command[0]
-			}
-		}
+	command := js.Task.Command
+	if len(command) > 0 {
+		name = command[0]
 	}
 	return name
 }