From 23c380e76832b4bcc37e6f1cd66e48a8ecb21cf6 Mon Sep 17 00:00:00 2001
From: PHILIPPOT Sebastien <sebastien.philippot@irisa.fr>
Date: Fri, 24 Jul 2020 14:59:09 +0200
Subject: [PATCH] [lib] add a check for command nodeset required by rake
gen:wiki and version:get
---
lib/refrepo/firmwares.rb | 2 ++
lib/refrepo/valid/network.rb | 2 ++
2 files changed, 4 insertions(+)
diff --git a/lib/refrepo/firmwares.rb b/lib/refrepo/firmwares.rb
index 7f0f7805a4..e68e61405c 100644
--- a/lib/refrepo/firmwares.rb
+++ b/lib/refrepo/firmwares.rb
@@ -54,6 +54,8 @@ def gen_firmwares_tables
end
end
end
+
+ system("which nodeset > /dev/null") or raise "WARNING: command nodeset absent, please install clustershell"
nodesets = nodes.group_by { |e| e.except('address') }.map do |e|
e[1] = e[1].map { |f| f['address'] }
nodes = `echo #{e[1].join(',')} | nodeset -f`.chomp
diff --git a/lib/refrepo/valid/network.rb b/lib/refrepo/valid/network.rb
index c048a6005f..e898df298d 100644
--- a/lib/refrepo/valid/network.rb
+++ b/lib/refrepo/valid/network.rb
@@ -318,6 +318,8 @@ def generate_dot(netnodes, links, site)
# group
nodeslinks = nodeslinks.group_by { |l| [ l['target_cluster'], l['attachments'] ] }.to_a.map { |e| e[1].map! { |f| f['target_node'] } ; e }
# factor
+ system("which nodeset > /dev/null") or raise "WARNING: command nodeset absent, please install clustershell"
+
nodeslinks.map! { |e| e[1] = sh("echo #{e[1].uniq.join(' ')}|nodeset -f"); e }
header = []
--
GitLab