From bf3a2814843a8f7a78592e3fb4c629fc9f4819b9 Mon Sep 17 00:00:00 2001
From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Fri, 26 Feb 2016 08:54:49 -0500
Subject: [PATCH] 6518: strigger works

---
 .../crunch-dispatch-slurm.go                      | 11 ++++++++---
 .../crunch-dispatch-slurm/crunch-finish-slurm.sh  | 15 ++++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
index 875eaa37fc..7f41a0a3ef 100644
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
@@ -209,8 +209,9 @@ func submit(container Container, crunchRunCommand string) (jobid string, submite
 	return
 }
 
-func strigger(jobid, containerUUID, finishCommand string) {
-	cmd := exec.Command("strigger", "--set", "--jobid="+jobid, "--fini", fmt.Sprintf("--program=%s", finishCommand))
+func strigger(jobid, containerUUID, finishCommand, apiHost, apiToken, apiInsecure string) {
+	cmd := exec.Command("strigger", "--set", "--jobid="+jobid, "--fini",
+		fmt.Sprintf("--program=%s %s %s %s %s", finishCommand, apiHost, apiToken, apiInsecure, containerUUID))
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	err := cmd.Run()
@@ -232,7 +233,11 @@ func run(container Container, crunchRunCommand, finishCommand string, priorityPo
 		return
 	}
 
-	strigger(jobid, container.UUID, finishCommand)
+	insecure := "0"
+	if arv.ApiInsecure {
+		insecure = "1"
+	}
+	strigger(jobid, container.UUID, finishCommand, arv.ApiServer, arv.ApiToken, insecure)
 
 	// Update container status to Running
 	err = arv.Update("containers", container.UUID,
diff --git a/services/crunch-dispatch-slurm/crunch-finish-slurm.sh b/services/crunch-dispatch-slurm/crunch-finish-slurm.sh
index 8be6fdd9e0..2977e1c6ec 100755
--- a/services/crunch-dispatch-slurm/crunch-finish-slurm.sh
+++ b/services/crunch-dispatch-slurm/crunch-finish-slurm.sh
@@ -1,7 +1,16 @@
 #!/bin/sh
 
-jobid=$1
+# I wonder if it is possible to attach metadata to job records to look these
+# things up instead of having to provide it on the command line.
 
-uuid=$(squeue --jobs=$jobid --states=all --format=%j --noheader)
+ARVADOS_API_HOST=$1
+ARVADOS_API_TOKEN=$2
+ARVADOS_API_HOST_INSECURE=$3
+uuid=$4
+jobid=$5
 
-arv containers update --uuid $uuid --container '{"state": "Completed"}'
+#uuid=$(squeue --jobs=$jobid --states=all --format=%j --noheader)
+
+export ARVADOS_API_HOST ARVADOS_API_TOKEN ARVADOS_API_HOST_INSECURE
+
+exec arv container update --uuid $uuid --container '{"state": "Complete"}'
-- 
2.30.2