From d955562c8230749d76b68920845675ae890d502d Mon Sep 17 00:00:00 2001
From: Chris Hines <chris.hines@monash.edu>
Date: Fri, 15 May 2015 04:47:07 +0000
Subject: [PATCH] provide explicit paths to sbatch squeue and scancel in the
strudel config generated for generic clusters
---
.../templates/generic_slurm_config.json.j2 | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/roles/strudel_config/templates/generic_slurm_config.json.j2 b/roles/strudel_config/templates/generic_slurm_config.json.j2
index 626495b7..17ba6262 100644
--- a/roles/strudel_config/templates/generic_slurm_config.json.j2
+++ b/roles/strudel_config/templates/generic_slurm_config.json.j2
@@ -91,7 +91,7 @@
"__class__": "cmdRegEx",
"__module__": "siteConfig",
"async": false,
- "cmd": "\"squeue -j {jobidNumber} -o \"%N\" | tail -n -1 | cut -f 1 -d ',' | xargs -iname getent hosts name | cut -f 1 -d ' ' \"",
+ "cmd": "\"{{ slurm_dir }}/bin/squeue -j {jobidNumber} -o \"%N\" | tail -n -1 | cut -f 1 -d ',' | xargs -iname getent hosts name | cut -f 1 -d ' ' \"",
"failFatal": true,
"formatFatal": false,
"host": "login",
@@ -121,7 +121,7 @@
"__class__": "cmdRegEx",
"__module__": "siteConfig",
"async": false,
- "cmd": "squeue -u {username} -o \\\"%i %L\\\" | tail -n -1",
+ "cmd": "{{ slurm_dir }}/bin/squeue -u {username} -o \\\"%i %L\\\" | tail -n -1",
"failFatal": true,
"formatFatal": false,
"host": "login",
@@ -208,7 +208,7 @@
"__class__": "cmdRegEx",
"__module__": "siteConfig",
"async": false,
- "cmd": "\"scontrol show job {jobidNumber}\"",
+ "cmd": "\"{{ slurm_dir }}/bin/scontrol show job {jobidNumber}\"",
"failFatal": true,
"formatFatal": false,
"host": "login",
@@ -268,7 +268,7 @@
"__class__": "cmdRegEx",
"__module__": "siteConfig",
"async": false,
- "cmd": "\"mkdir ~/.vnc ; rm -f ~/.vnc/clearpass ; touch ~/.vnc/clearpass ; chmod 600 ~/.vnc/clearpass ; passwd=\"'$'\"( dd if=/dev/urandom bs=1 count=8 2>/dev/null | md5sum | cut -b 1-8 ) ; echo \"'$'\"passwd > ~/.vnc/clearpass ; cat ~/.vnc/clearpass | vncpasswd -f > ~/.vnc/passwd ; chmod 600 ~/.vnc/passwd ; echo -e '#!/bin/bash\\nvncserver ; sleep 36000000 ' | sbatch -p batch -N {nodes} -n {ppn} --time={hours}:00:00 -J desktop_{username} -o .vnc/slurm-%j.out \"",
+ "cmd": "\"mkdir ~/.vnc ; rm -f ~/.vnc/clearpass ; touch ~/.vnc/clearpass ; chmod 600 ~/.vnc/clearpass ; passwd=\"'$'\"( dd if=/dev/urandom bs=1 count=8 2>/dev/null | md5sum | cut -b 1-8 ) ; echo \"'$'\"passwd > ~/.vnc/clearpass ; cat ~/.vnc/clearpass | vncpasswd -f > ~/.vnc/passwd ; chmod 600 ~/.vnc/passwd ; echo -e '#!/bin/bash\\nvncserver ; sleep 36000000 ' | {{slurm_dir}}/bin/sbatch -p batch -N {nodes} -n {ppn} --time={hours}:00:00 -J desktop_{username} -o .vnc/slurm-%j.out \"",
"failFatal": true,
"formatFatal": false,
"host": "login",
@@ -282,7 +282,7 @@
"__class__": "cmdRegEx",
"__module__": "siteConfig",
"async": false,
- "cmd": "\"scancel {jobidNumber}\"",
+ "cmd": "\"{{ slurm_dir }}/bin/scancel {jobidNumber}\"",
"failFatal": true,
"formatFatal": false,
"host": "login",
--
GitLab