From 5107b61549244b301c37391930f88e5dc5c2ec2a Mon Sep 17 00:00:00 2001
From: handreas <andreas.hamacher@monash.edu>
Date: Fri, 27 Mar 2020 04:40:41 +0000
Subject: [PATCH] adding tests for slurm and little fixes
Former-commit-id: 5d04c8700c96c8e1569716d62f19a48ce89ccf2e
---
.gitlab-ci.yml | 4 ++++
roles/calculateSlurmConf/templates/slurm.conf.j2 | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cdb52f32..75ecc421 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -163,6 +163,10 @@ tests:
- bash -e ./tests/run_tests.sh NFSNodes "files/inventory.$STACKNAME" "../gc_key.pem"
- bash -e ./tests/run_tests.sh SQLNodes "files/inventory.$STACKNAME" "../gc_key.pem"
+ - sudo `which sacctmgr` add account pXXX cluster=m3 Description="Test parent account" Organization="Monash"
+ - sudo `which sacctmgr` add account ab12 parent=pXXX cluster=m3 Organization="Monash"
+ - sudo `which sacctmgr` create user slurmtest cluster=m3 account=ab12
+ - srun --ntasks=2 --partition=batch hostname
# licensing https://gitlab.erc.monash.edu.au/hpc-team/license_server/tree/master/roles/avizo_license_monitor
manual_cluster_spawn:
diff --git a/roles/calculateSlurmConf/templates/slurm.conf.j2 b/roles/calculateSlurmConf/templates/slurm.conf.j2
index dc833e3e..d460ef81 100644
--- a/roles/calculateSlurmConf/templates/slurm.conf.j2
+++ b/roles/calculateSlurmConf/templates/slurm.conf.j2
@@ -119,8 +119,8 @@ JobCompType=jobcomp/none
Prolog={{ slurmjob.prolog }}
Epilog={{ slurmjob.epilog }}
{% else %}
-Prolog={{ slurm_dir }}/bin/slurm.prolog
-Epilog={{ slurm_dir }}/bin/slurm.epilog
+Prolog=/opt/slurm/etc/slurm.prolog
+Epilog=/opt/slurm/etc/slurm.epilog
{% endif %}
#
# ACCOUNTING
--
GitLab