From a2331a2b64adb97cf64ef9def0bbba02f380dc58 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 9 Mar 2019 19:21:36 +0100 Subject: [PATCH 1/2] slurm: 18.08.5.2 -> 18.08.6.2 --- pkgs/servers/computing/slurm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 5ae985ca048..7a01342e5ac 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "18.08.5.2"; + version = "18.08.6.2"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${builtins.replaceStrings ["."] ["-"] name}"; - sha256 = "0x1pdq58sdf0m28cai0lcyzvhhjl7l85gq324pwh8fi3zy2h0n4k"; + sha256 = "0py1795jrgip00k46gr9f9y49gpv5478kc3v68d90nl158fngixc"; }; outputs = [ "out" "dev" ]; From 62ea707e31329b0b38fe9f89a8910d07603df655 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 9 Mar 2019 22:31:40 +0100 Subject: [PATCH 2/2] nixos/tests: make slurm test more reliable --- nixos/tests/slurm.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix index b4458d8d095..720c36d472e 100644 --- a/nixos/tests/slurm.nix +++ b/nixos/tests/slurm.nix @@ -108,6 +108,8 @@ in { # cluster in the database before slurmctld is restarted subtest "add_account", sub { $control->succeed("sacctmgr -i add cluster default"); + # check for cluster entry + $control->succeed("sacctmgr list cluster | awk '{ print \$1 }' | grep default"); }; subtest "can_start_slurmctld", sub { @@ -133,6 +135,7 @@ in { subtest "check_slurm_dbd", sub { # find the srun job from above in the database + sleep 2; $submit->succeed("sacct | grep hostname"); }; '';