From 0ee807213e5b58b9bac0f95d73a58474cd03d898 Mon Sep 17 00:00:00 2001
From: Philippe Virouleau <philippe.virouleau@inria.fr>
Date: Wed, 26 Jun 2024 10:14:56 +0200
Subject: [PATCH] [accesses] fix generators
- use author date for accesses_mode_history
- do not emit retired nodes
---
lib/refrepo/accesses.rb | 2 +-
lib/refrepo/gen/reference-api.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/refrepo/accesses.rb b/lib/refrepo/accesses.rb
index be4316b1228..f208b0dfe0f 100644
--- a/lib/refrepo/accesses.rb
+++ b/lib/refrepo/accesses.rb
@@ -101,7 +101,7 @@ def generate_nodeset_mode_history
yaml_path = File.join(INPUT_FOLDER, "#{site}.yaml")
next unless File.exist?(yaml_path)
- commits = git_repo.log.path(yaml_path).map { |commit| [commit.date, commit.sha] }.sort_by(&:first)
+ commits = git_repo.log.path(yaml_path).map { |commit| [commit.author.date, commit.sha] }.sort_by(&:first)
process_commits(commits, git_repo, yaml_path, nodeset_history, known_nodeset)
end
diff --git a/lib/refrepo/gen/reference-api.rb b/lib/refrepo/gen/reference-api.rb
index 985651d655f..76694511242 100644
--- a/lib/refrepo/gen/reference-api.rb
+++ b/lib/refrepo/gen/reference-api.rb
@@ -181,7 +181,7 @@ def generate_reference_api
[cluster_uid, {
"uid" => cluster_uid,
"queues" => cluster["queues"],
- "nodes" => cluster["nodes"].to_h do |node_uid, node|
+ "nodes" => cluster["nodes"].select { |_, n| n["status"] != "retired" }.to_h do |node_uid, node|
[node_uid, node.select { |key| %w[uid nodeset gpu_devices processor architecture].include?(key) }]
end
}]
--
GitLab