From 1dc3258bf03c02e4e6bed239c9a6d323b53bddb6 Mon Sep 17 00:00:00 2001 From: BERARD Benjamin <benjamin.berard@inria.fr> Date: Wed, 22 Jan 2020 18:27:58 +0100 Subject: [PATCH] [oar] Remove opa into valid:oar-properties and edit wiki --- lib/refrepo/gen/wiki/generators/oar_properties.rb | 5 +---- lib/refrepo/valid/oar-properties.rb | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/refrepo/gen/wiki/generators/oar_properties.rb b/lib/refrepo/gen/wiki/generators/oar_properties.rb index 0994c9e8ef..1aaf24bac7 100644 --- a/lib/refrepo/gen/wiki/generators/oar_properties.rb +++ b/lib/refrepo/gen/wiki/generators/oar_properties.rb @@ -94,9 +94,6 @@ class OarPropertiesGenerator < WikiGenerator "ib_rate" => { "description" => "The rate of the connected Infiniband interface in Gbps" }, - "opa" => { - "description" => "Whether an Omni-Path interface is available" - }, "opa_count" => { "description" => "The number of Omni-Path interfaces available" }, @@ -146,7 +143,7 @@ class OarPropertiesGenerator < WikiGenerator @@categories = { "Job-related properties" => ["besteffort", "deploy", "production", "cluster_priority", "max_walltime"], "Hierarchy" => ["cluster", "cpu", "core", "host", "network_address", "ip", "switch"], - "Hardware" => ["gpu_model", "gpu_count", "memnode", "memcore", "memcpu", "disktype", "disk_reservation_count", "myri_rate", "myri_count", "myri", "ib_rate", "ib_count", "ib", "opa", "opa_rate", "opa_count", "eth_rate", "eth_count", "cpufreq", "cputype", "cpucore", "cpuarch", "virtual", "mic"], + "Hardware" => ["gpu_model", "gpu_count", "memnode", "memcore", "memcpu", "disktype", "disk_reservation_count", "myri_rate", "myri_count", "myri", "ib_rate", "ib_count", "ib", "opa_rate", "opa_count", "eth_rate", "eth_count", "cpufreq", "cputype", "cpucore", "cpuarch", "virtual", "mic"], "Miscellaneous" => ["wattmeter", "nodemodel"] } diff --git a/lib/refrepo/valid/oar-properties.rb b/lib/refrepo/valid/oar-properties.rb index 3aad9034c6..c3e40795e3 100644 --- a/lib/refrepo/valid/oar-properties.rb +++ b/lib/refrepo/valid/oar-properties.rb @@ -7,7 +7,7 @@ require 'hashdiff' IGNORED_PROPERTIES=%w{} # Propriétés qui devraient être présentes -G5K_PROPERTIES=%w{api_timestamp available_upto besteffort chassis chunks cluster cluster_priority comment core cpu cpuarch cpucore cpufreq cpuset cputype deploy desktop_computing disk disk_reservation_count diskpath disktype drain eth_count eth_rate expiry_date finaud_decision gpu gpudevice gpu_model gpu_count grub host ib ib_count ib_rate id ip last_available_upto last_job_date links maintenance max_walltime memcore memcpu memnode mic myri myri_count myri_rate network_address next_finaud_decision next_state nodemodel production rconsole scheduler_priority slash_16 slash_17 slash_18 slash_19 slash_20 slash_21 slash_22 state state_num subnet_address subnet_prefix suspended_jobs switch type virtual vlan wattmeter opa opa_count opa_rate}.sort - IGNORED_PROPERTIES +G5K_PROPERTIES=%w{api_timestamp available_upto besteffort chassis chunks cluster cluster_priority comment core cpu cpuarch cpucore cpufreq cpuset cputype deploy desktop_computing disk disk_reservation_count diskpath disktype drain eth_count eth_rate expiry_date finaud_decision gpu gpudevice gpu_model gpu_count grub host ib ib_count ib_rate id ip last_available_upto last_job_date links maintenance max_walltime memcore memcpu memnode mic myri myri_count myri_rate network_address next_finaud_decision next_state nodemodel production rconsole scheduler_priority slash_16 slash_17 slash_18 slash_19 slash_20 slash_21 slash_22 state state_num subnet_address subnet_prefix suspended_jobs switch type virtual vlan wattmeter opa_count opa_rate}.sort - IGNORED_PROPERTIES module RefRepo::Valid::OarProperties -- GitLab