From 7721c0129bc33e5e9edb2a63eeae200df2939563 Mon Sep 17 00:00:00 2001
From: Lancelot Doan <lancelot.doan@inria.fr>
Date: Mon, 12 May 2025 11:19:32 +0200
Subject: [PATCH] [Sophia][Estrel31] From testing to Prod

---
 data/grid5000/accesses/nodesets.json          | 56 +++++++++++++++++++
 .../sophia/clusters/esterel31/esterel31.json  |  2 +-
 .../clusters/esterel31/nodes/esterel31-1.json |  4 +-
 .../clusters/esterel31/nodes/esterel31-2.json |  4 +-
 .../clusters/esterel31/nodes/esterel31-3.json |  4 +-
 .../clusters/esterel31/nodes/esterel31-4.json |  4 +-
 input/grid5000/access/sophia.yaml             |  2 +
 .../sophia/clusters/esterel31/esterel31.yaml  |  4 +-
 8 files changed, 69 insertions(+), 11 deletions(-)

diff --git a/data/grid5000/accesses/nodesets.json b/data/grid5000/accesses/nodesets.json
index bb63efe3a84..7dd4a6decda 100644
--- a/data/grid5000/accesses/nodesets.json
+++ b/data/grid5000/accesses/nodesets.json
@@ -2182,6 +2182,62 @@
       ]
     }
   },
+  "esterel31": {
+    "besteffort": {
+      "ggas": [
+        "cidre",
+        "kerdata",
+        "magellan",
+        "myriads",
+        "pacap",
+        "wide",
+        "pirat",
+        "coast",
+        "avalon",
+        "chroma",
+        "emeraude",
+        "maracas",
+        "inria-chile",
+        "inria-dsi",
+        "inria-sidf",
+        "swh",
+        "tadaam"
+      ],
+      "sites": [
+        "mc-rennes",
+        "mc-nancy",
+        "mc-lyon",
+        "mc-economic-activity",
+        "mc-sophia",
+        "mc-lille",
+        "mc-grenoble",
+        "mc-paris",
+        "mc-saclay",
+        "mc-bordeaux",
+        "mc-siege",
+        "mc-guest",
+        "slices-fr-grenoble",
+        "slices-fr-lille",
+        "slices-fr-lyon",
+        "slices-fr-nancy",
+        "slices-fr-nantes",
+        "slices-fr-rennes",
+        "slices-fr-sophia",
+        "slices-fr-strasbourg",
+        "slices-fr-toulouse"
+      ]
+    },
+    "p1": {
+      "ggas": [
+        "i3s",
+        "sparks"
+      ],
+      "sites": [
+        "mc-staff-site",
+        "g5k-staff-site"
+      ]
+    }
+  },
   "esterel32": {
     "besteffort": {
       "ggas": [
diff --git a/data/grid5000/sites/sophia/clusters/esterel31/esterel31.json b/data/grid5000/sites/sophia/clusters/esterel31/esterel31.json
index 6c7c3c26af7..ba00ab1294f 100644
--- a/data/grid5000/sites/sophia/clusters/esterel31/esterel31.json
+++ b/data/grid5000/sites/sophia/clusters/esterel31/esterel31.json
@@ -145,7 +145,7 @@
   "priority": 202108,
   "queues": [
     "admin",
-    "testing"
+    "production"
   ],
   "redfish": true,
   "type": "cluster",
diff --git a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-1.json b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-1.json
index cb7226d9466..39df31e0c95 100644
--- a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-1.json
@@ -314,10 +314,10 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 0,
+    "max_walltime": 604800,
     "queues": [
       "admin",
-      "testing"
+      "production"
     ],
     "virtual": "ivt"
   },
diff --git a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-2.json b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-2.json
index d3df2e4111a..f22d723f69c 100644
--- a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-2.json
+++ b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-2.json
@@ -314,10 +314,10 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 0,
+    "max_walltime": 604800,
     "queues": [
       "admin",
-      "testing"
+      "production"
     ],
     "virtual": "ivt"
   },
diff --git a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-3.json b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-3.json
index 487e1362f54..db3a603b309 100644
--- a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-3.json
+++ b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-3.json
@@ -314,10 +314,10 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 0,
+    "max_walltime": 604800,
     "queues": [
       "admin",
-      "testing"
+      "production"
     ],
     "virtual": "ivt"
   },
diff --git a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-4.json b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-4.json
index 44f84dbbee2..4313decf649 100644
--- a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-4.json
+++ b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-4.json
@@ -314,10 +314,10 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "max_walltime": 0,
+    "max_walltime": 604800,
     "queues": [
       "admin",
-      "testing"
+      "production"
     ],
     "virtual": "ivt"
   },
diff --git a/input/grid5000/access/sophia.yaml b/input/grid5000/access/sophia.yaml
index aba1dd97c33..6e597661828 100644
--- a/input/grid5000/access/sophia.yaml
+++ b/input/grid5000/access/sophia.yaml
@@ -48,6 +48,8 @@ esterel32: &dedicated-i3s-sparks
     p1: [i3s, sparks, '@admin']
     besteffort: ['@inria_group', '@other_groups_with_access']
 
+esterel31: *dedicated-i3s-sparks
+
 esterel33: &dedicated-neo
     p1: [neo, '@admin']
     besteffort: ['@inria_group', '@other_groups_with_access']
diff --git a/input/grid5000/sites/sophia/clusters/esterel31/esterel31.yaml b/input/grid5000/sites/sophia/clusters/esterel31/esterel31.yaml
index f5d13e8b758..b60713f3b98 100644
--- a/input/grid5000/sites/sophia/clusters/esterel31/esterel31.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel31/esterel31.yaml
@@ -6,13 +6,13 @@ boot_type: bios
 exotic: false
 queues:
   - admin
-  - testing
+  - production
 nodes:
   esterel31-[1-4]:
     supported_job_types:
       deploy: true
       besteffort: true
-      max_walltime: 0
+      max_walltime: 604800
     processor:
       microarchitecture: Cascade Lake-SP
       clock_speed: 2_100_000_000
-- 
GitLab