From 5bfc92604ad9f22d75ff3be44d03a2e3ff707455 Mon Sep 17 00:00:00 2001
From: Lucas Nussbaum <lucas.nussbaum@loria.fr>
Date: Sun, 19 Jan 2020 10:09:00 +0100
Subject: [PATCH] [gen/oar-properties] introduce a list of OAR system
 properties that should not be added

This fixes:
 - https://intranet.grid5000.fr/bugzilla/show_bug.cgi?id=11352
 - https://intranet.grid5000.fr/bugzilla/show_bug.cgi?id=11245
---
 lib/refrepo/gen/oar-properties.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/refrepo/gen/oar-properties.rb b/lib/refrepo/gen/oar-properties.rb
index e486f04d35f..a791df03c71 100644
--- a/lib/refrepo/gen/oar-properties.rb
+++ b/lib/refrepo/gen/oar-properties.rb
@@ -85,6 +85,10 @@ def generate_create_oar_property_cmd(properties_keys)
     if ignore_keys_list.include?(key)
       next
     end
+    # keys such as deploy or besteffort are default OAR keys that should not be created
+    if oar_system_keys.include?(key)
+      next
+    end
     if key_type == Fixnum # rubocop:disable Lint/UnifiedInteger
       command += "property_exist '#{key}' || oarproperty -a #{key}\n"
     elsif key_type == String
@@ -779,6 +783,14 @@ def ignore_keys()
   return ignore_default_keys() + ignore_disk_keys()
 end
 
+# Properties such as deploy and besteffort, that should not be created
+def oar_system_keys()
+  [
+    'deploy',
+    'besteffort'
+  ]
+end
+
 def get_oar_resources_from_oar(options)
   properties = {}
   options.fetch(:sites).each do |site_uid|
-- 
GitLab