From b1b280679548f07d67fe516edd2d6d42198495e4 Mon Sep 17 00:00:00 2001
From: Pierre Neyron <pierre.neyron@imag.fr>
Date: Fri, 14 Jun 2019 10:29:50 +0200
Subject: [PATCH] fixup for #10143: the gpu OAR property does not exist anymore
(yet)
---
lib/refrepo/gen/wiki/generators/oar_properties.rb | 4 ----
lib/refrepo/valid/oar-properties.rb | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/lib/refrepo/gen/wiki/generators/oar_properties.rb b/lib/refrepo/gen/wiki/generators/oar_properties.rb
index 9963ff20363..8e97c5c1d90 100644
--- a/lib/refrepo/gen/wiki/generators/oar_properties.rb
+++ b/lib/refrepo/gen/wiki/generators/oar_properties.rb
@@ -129,10 +129,6 @@ class OarPropertiesGenerator < WikiGenerator
"gpu_count" => {
"description" => "The number of GPU cards available"
},
- "gpu" => {
- "description" => "The ID of the GPU the resource is part of. The unique scope is the OAR server. ",
- "possible_values" => "1, 2, 3, ..."
- },
"wattmeter" => {
"description" => "The type of wattmeter available"
},
diff --git a/lib/refrepo/valid/oar-properties.rb b/lib/refrepo/valid/oar-properties.rb
index a34cee47bc7..9a8238d5b32 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_model gpu_count gpu 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_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
module RefRepo::Valid::OarProperties
--
GitLab