[ARVADOS] updated: 1.1.1-60-g8b13dd5

[Git user]

Summary of changes:
 services/crunch-dispatch-slurm/crunch-dispatch-slurm.go      | 2 +-
 services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

       via  8b13dd5b407cdf17db563e80b1e5c5881c316ad6 (commit)
      from  3a2bac3f64cd19c11bcfa9b957b7b473ddfb7a55 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 8b13dd5b407cdf17db563e80b1e5c5881c316ad6
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Dec 1 10:01:37 2017 -0500

    12573: Fix scontrol Nice (due of error in scontrol man page).
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
index 2f30ebf..c6ef47c 100644
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
@@ -194,7 +194,7 @@ func scancelFunc(container arvados.Container) *exec.Cmd {
 
 // scontrolCmd
 func scontrolFunc(container arvados.Container) *exec.Cmd {
-	return exec.Command("scontrol", "update", "JobName="+container.UUID, fmt.Sprintf("--nice=%d", niceness(container.Priority)))
+	return exec.Command("scontrol", "update", "JobName="+container.UUID, fmt.Sprintf("Nice=%d", niceness(container.Priority)))
 }
 
 // Wrap these so that they can be overridden by tests
diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go b/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
index 052cdfb..33cfdfc 100644
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
@@ -453,5 +453,5 @@ func (s *TestSuite) TestIntegrationChangePriority(c *C) {
 			dispatcher.UpdateState(container.UUID, dispatch.Complete)
 		})
 	c.Check(container.State, Equals, arvados.ContainerStateComplete)
-	c.Check(scontrolCmdLine, DeepEquals, []string{"scontrol", "update", "JobName=zzzzz-dz642-queuedcontainer", "--nice=400000"})
+	c.Check(scontrolCmdLine, DeepEquals, []string{"scontrol", "update", "JobName=zzzzz-dz642-queuedcontainer", "Nice=400000"})
 }

-----------------------------------------------------------------------


hooks/post-receive
--