From 829ce2d72df181c9c851e49334b11fa533382ca1 Mon Sep 17 00:00:00 2001
From: Nicolas Perrin <nicolas.perrin@inria.fr>
Date: Wed, 12 Feb 2025 16:45:43 +0100
Subject: [PATCH] [sophia][mercantour2] move to production
---
data/grid5000/accesses/nodesets.json | 67 +++++++++++++++++++
.../clusters/mercantour2/mercantour2.json | 2 +-
.../mercantour2/nodes/mercantour2-1.json | 2 +-
.../mercantour2/nodes/mercantour2-2.json | 2 +-
.../mercantour2/nodes/mercantour2-3.json | 2 +-
.../mercantour2/nodes/mercantour2-4.json | 2 +-
.../mercantour2/nodes/mercantour2-5.json | 2 +-
.../mercantour2/nodes/mercantour2-6.json | 2 +-
.../mercantour2/nodes/mercantour2-7.json | 2 +-
.../mercantour2/nodes/mercantour2-8.json | 2 +-
input/grid5000/access/group.yaml | 3 +
input/grid5000/access/sophia.yaml | 7 ++
.../clusters/mercantour2/mercantour2.yaml | 2 +-
13 files changed, 87 insertions(+), 10 deletions(-)
diff --git a/data/grid5000/accesses/nodesets.json b/data/grid5000/accesses/nodesets.json
index 169e525ae50..12c509a15e9 100644
--- a/data/grid5000/accesses/nodesets.json
+++ b/data/grid5000/accesses/nodesets.json
@@ -2394,6 +2394,73 @@
]
}
},
+ "mercantour2": {
+ "p1": {
+ "ggas": [
+ "zenith"
+ ],
+ "sites": [
+ "mc-sophia",
+ "mc-staff-site",
+ "g5k-staff-site"
+ ]
+ },
+ "p3": {
+ "ggas": [
+ "cidre",
+ "kerdata",
+ "magellan",
+ "myriads",
+ "pacap",
+ "wide",
+ "pirat",
+ "coast",
+ "avalon",
+ "chroma",
+ "emeraude",
+ "maracas",
+ "hive",
+ "inriastartupstudio",
+ "sonaide",
+ "feelim",
+ "iss-idiscover",
+ "iss-manta",
+ "inria-chile",
+ "inria-dsi",
+ "inria-sidf",
+ "swh",
+ "tadaam"
+ ],
+ "sites": [
+ "mc-rennes",
+ "mc-nancy",
+ "mc-lyon",
+ "mc-sophia",
+ "mc-lille",
+ "mc-grenoble",
+ "mc-paris",
+ "mc-saclay",
+ "mc-bordeaux"
+ ]
+ },
+ "p4": {
+ "ggas": [
+
+ ],
+ "sites": [
+ "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"
+ ]
+ }
+ },
"musa": {
"p1": {
"ggas": [
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/mercantour2.json b/data/grid5000/sites/sophia/clusters/mercantour2/mercantour2.json
index e4b1c2f78c0..eb8e730dcb3 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/mercantour2.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/mercantour2.json
@@ -55,7 +55,7 @@
"priority": 201509,
"queues": [
"admin",
- "testing"
+ "production"
],
"redfish": true,
"type": "cluster",
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-1.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-1.json
index 2870fc02f7f..850fb3ce8b8 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-1.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-1.json
@@ -300,7 +300,7 @@
"max_walltime": 0,
"queues": [
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-2.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-2.json
index 229dc8b5ab8..f5cb416ce44 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-2.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-2.json
@@ -300,7 +300,7 @@
"max_walltime": 0,
"queues": [
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json
index 430c2c40585..661ba9232bd 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json
@@ -300,7 +300,7 @@
"max_walltime": 0,
"queues": [
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json
index 69e7300f248..1c0fcaf1061 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json
@@ -300,7 +300,7 @@
"max_walltime": 0,
"queues": [
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-5.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-5.json
index fa0bed6a1a0..f24823bfb30 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-5.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-5.json
@@ -300,7 +300,7 @@
"max_walltime": 0,
"queues": [
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-6.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-6.json
index 3d9b5de22db..c047522ec4f 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-6.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-6.json
@@ -300,7 +300,7 @@
"max_walltime": 0,
"queues": [
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json
index 028a034ffcc..2b1247a9888 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json
@@ -300,7 +300,7 @@
"max_walltime": 0,
"queues": [
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json
index 750d7e42505..ab4adbc6b1a 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json
@@ -300,7 +300,7 @@
"max_walltime": 0,
"queues": [
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/input/grid5000/access/group.yaml b/input/grid5000/access/group.yaml
index a5cbbb95849..4195d4d9a50 100644
--- a/input/grid5000/access/group.yaml
+++ b/input/grid5000/access/group.yaml
@@ -12,6 +12,9 @@
admin: ['%mc-staff-site','%g5k-staff-site']
# GROUPS FOR A SPECIFIC INRIA CENTER
+## mc group of inria sophia, also include some slices-fr groups
+inria_sophia_group: ['%mc-sophia', zenith]
+
## mc group of inria rennes, also include some slices-fr groups
inria_rennes_group: ['%mc-rennes', cidre, kerdata, magellan, myriads, pacap, wide, pirat]
diff --git a/input/grid5000/access/sophia.yaml b/input/grid5000/access/sophia.yaml
index ef6c32c68dc..1c425962c57 100644
--- a/input/grid5000/access/sophia.yaml
+++ b/input/grid5000/access/sophia.yaml
@@ -7,6 +7,13 @@ musa:
p2: ['@inria_group']
p4: ['@other_groups_with_access']
+# SHARED MODE
+mercantour2:
+ p1: ['@inria_sophia_group', '@admin']
+ p3: ['@inria_group']
+ p4: ['@other_groups_with_access']
+
+# DEDICATED MODE
esterel41:
p1: [evergreen, '@admin']
besteffort: ['@inria_group', '@other_groups_with_access']
diff --git a/input/grid5000/sites/sophia/clusters/mercantour2/mercantour2.yaml b/input/grid5000/sites/sophia/clusters/mercantour2/mercantour2.yaml
index 20c9d08b30d..26f91ed483b 100644
--- a/input/grid5000/sites/sophia/clusters/mercantour2/mercantour2.yaml
+++ b/input/grid5000/sites/sophia/clusters/mercantour2/mercantour2.yaml
@@ -6,7 +6,7 @@ boot_type: bios
exotic: false
queues:
- admin
- - testing
+ - production
nodes:
mercantour2-[1-8]:
supported_job_types:
--
GitLab