From bd3aeeac04c817d63eff3da0b4dfe57be2c7de44 Mon Sep 17 00:00:00 2001
From: Pierre Neyron <pierre.neyron@imag.fr>
Date: Tue, 9 Jul 2019 18:42:11 +0200
Subject: [PATCH] Revert "[oar-properties] add the gpu and gpudevice OAR
properties."
This reverts commit 35681027d854871eed41d7ab9c360945cec74c59.
Which is wrong.
---
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 99b8ac357be..8e97c5c1d90 100644
--- a/lib/refrepo/gen/wiki/generators/oar_properties.rb
+++ b/lib/refrepo/gen/wiki/generators/oar_properties.rb
@@ -43,10 +43,6 @@ class OarPropertiesGenerator < WikiGenerator
"description" => "The ID of the CPU the resource is part of. The unique scope is the OAR server. ",
"possible_values" => "1, 2, 3, ..."
},
- "gpu" => {
- "description" => "The ID of the GPU the resource is part of. The unique scope is the OAR server. ",
- "possible_values" => "1, 2, 3, ..."
- },
"host" => {
"description" => "A user-friendly name for the network_address property",
"possible_values" => "dahu-1.grenoble.grid5000.fr, ..."
diff --git a/lib/refrepo/valid/oar-properties.rb b/lib/refrepo/valid/oar-properties.rb
index 3aad9034c67..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 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_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