diff --git a/data/grid5000/accesses/nodesets.json b/data/grid5000/accesses/nodesets.json
index 169e525ae506cb8d71f6444cd926a7b3f4652d80..12c509a15e97d4a2d0643cf56b72095c6dac9d4f 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 e4b1c2f78c0b480807409b5f6dffc13dec0424d9..eb8e730dcb3754571fe2aa757a2ca847cac3e70d 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 2870fc02f7f9caccfd540a653f34c4a989d4b852..850fb3ce8b811be8e0e0ab135ec85a5275419244 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 229dc8b5ab86d517634b2f420c0e7367bb04babb..f5cb416ce4446f157b05d9e9c2a8feca51d76db0 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 430c2c40585e19be42a489852aa57ff33b16bae5..661ba9232bdd731f5f239d410ac99de68383131b 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 69e7300f248c11d8935581f04ccfff448fe710a8..1c0fcaf1061a9efffab8c4778531cbe144e8fc70 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 fa0bed6a1a0c7634760b721d6e206400fb23f8a4..f24823bfb3027a3c26a80876af172bd690498ec0 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 3d9b5de22db32634f6ccac5c8a9a0dd2b358dd86..c047522ec4f8d99d7afb605ea09694eb99e7ebd1 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 028a034ffcc5a849aa89c3f49e35c243663f43cf..2b1247a988801491042882798668d262784ae363 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 750d7e42505401a161d3d19805b94a57a38a3757..ab4adbc6b1a12519063e08479e1e7bcdd661d689 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 a5cbbb958492308eb96d1435188d59484966d9fc..4195d4d9a50cf8a05a9425f5027ebfc6bcb272e3 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 ef6c32c68dcd04b63cef733ca88003b6cdcbef1d..1c425962c57ab150a1aa707de385fd2d9ee14534 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 20c9d08b30db506c1bb299b6739202364b805656..26f91ed483bcf98fceddfc9deed3661f2bbf2766 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: