diff --git a/data/grid5000/accesses/nodesets.json b/data/grid5000/accesses/nodesets.json
index 6e2fc77fb10873dcf50430a635d03d8957a87467..a320505f484634b2cba17ecc58ca397881746e65 100644
--- a/data/grid5000/accesses/nodesets.json
+++ b/data/grid5000/accesses/nodesets.json
@@ -4244,6 +4244,77 @@
]
}
},
+ "mercantour3": {
+ "p1": {
+ "ggas": [
+ "zenith"
+ ],
+ "sites": [
+ "mc-sophia",
+ "mc-staff-site",
+ "g5k-staff-site"
+ ]
+ },
+ "p3": {
+ "ggas": [
+ "spirals",
+ "bonus",
+ "corse",
+ "datamove",
+ "erods",
+ "nanosim2",
+ "polaris",
+ "zenith",
+ "cidre",
+ "kerdata",
+ "magellan",
+ "myriads",
+ "pacap",
+ "wide",
+ "pirat",
+ "coast",
+ "avalon",
+ "chroma",
+ "emeraude",
+ "maracas",
+ "inria-chile",
+ "inria-dsi",
+ "inria-sidf",
+ "swh",
+ "tadaam"
+ ],
+ "sites": [
+ "mc-lille",
+ "mc-grenoble",
+ "mc-sophia",
+ "mc-rennes",
+ "mc-nancy",
+ "mc-lyon",
+ "mc-economic-activity",
+ "mc-paris",
+ "mc-saclay",
+ "mc-bordeaux",
+ "mc-siege"
+ ]
+ },
+ "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"
+ ]
+ }
+ },
"mercantour4": {
"p1": {
"ggas": [
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/mercantour3.json b/data/grid5000/sites/sophia/clusters/mercantour3/mercantour3.json
index 14c1e395e2bd390400c4d2e70b88956f67cf9fa9..54e51262e2d6d37e66cd0598a4ef88b105fdbc0c 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/mercantour3.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/mercantour3.json
@@ -144,8 +144,9 @@
"nodes_description": "2 CPUs Intel Xeon Silver 4114, 10 cores/CPU, 192GB RAM, 558GB HDD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand",
"priority": 201711,
"queues": [
+ "abaca",
"admin",
- "testing"
+ "production"
],
"redfish": true,
"type": "cluster",
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-1.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-1.json
index c7078a6c41ee4dad0145b9b9eeaf269e04fb9f61..3c4d78852137f4b926033a836b3f50f44c4b3bb5 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-1.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-1.json
@@ -199,10 +199,11 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
- "max_walltime": 0,
+ "max_walltime": 604800,
"queues": [
+ "abaca",
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-10.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-10.json
index 78419dc7470158f63ba82da383957f3b3e0ed958..0c64fcf62280f2f5feb715cb21631f4045400205 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-10.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-10.json
@@ -199,10 +199,11 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
- "max_walltime": 0,
+ "max_walltime": 604800,
"queues": [
+ "abaca",
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-11.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-11.json
index a749d38ba096df366c18b23a27d7245bfb0a3a83..756f765af034c541ab6bb3c68d243f39b590762a 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-11.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-11.json
@@ -199,10 +199,11 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
- "max_walltime": 0,
+ "max_walltime": 604800,
"queues": [
+ "abaca",
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-12.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-12.json
index 5a972b27237154bb8af03ffcb0d64eb1f42eaa4a..c38530ec8a7a7a240432904f0c0120c581e8645a 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-12.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-12.json
@@ -199,10 +199,11 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
- "max_walltime": 0,
+ "max_walltime": 604800,
"queues": [
+ "abaca",
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-13.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-13.json
index 6ff531555aed2dbae5b4f0ce61abda33301a0d86..ea4b5345668740b2cc05349a1d8c404d2d5a576a 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-13.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-13.json
@@ -199,10 +199,11 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
- "max_walltime": 0,
+ "max_walltime": 604800,
"queues": [
+ "abaca",
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-14.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-14.json
index cefcba9b76dc65da3b723717fb6e4163a05e3bdb..5719cf2407e7f2b7f35da773a11745cd3012145a 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-14.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-14.json
@@ -199,10 +199,11 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
- "max_walltime": 0,
+ "max_walltime": 604800,
"queues": [
+ "abaca",
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-15.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-15.json
index e00fb91af717625df31703202ad8a32114bf5abf..76dea81d6db0f2927b3925bb178997886d152b03 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-15.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-15.json
@@ -199,10 +199,11 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
- "max_walltime": 0,
+ "max_walltime": 604800,
"queues": [
+ "abaca",
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-16.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-16.json
index 626fbee71fefa80d220de1a6a68dd44e0ec0bf35..432f7cc8348fcb1f1f36f97c1025fd1ddb198630 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-16.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-16.json
@@ -199,10 +199,11 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
- "max_walltime": 0,
+ "max_walltime": 604800,
"queues": [
+ "abaca",
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-2.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-2.json
index f2e1e99de9ce94b73795b9cfd5fbe4917326c171..7be631e6614e7e999220810fd27cd99f47525b76 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-2.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-2.json
@@ -199,10 +199,11 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
- "max_walltime": 0,
+ "max_walltime": 604800,
"queues": [
+ "abaca",
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-3.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-3.json
index ec943b4d24ace24f169746cb997e595f28f2f372..fa01801813cac898464a769e3ad780650d39b476 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-3.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-3.json
@@ -199,10 +199,11 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
- "max_walltime": 0,
+ "max_walltime": 604800,
"queues": [
+ "abaca",
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-4.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-4.json
index b52b7abeea95e6f3f35b7191614057dbb3df9700..0d96443eb38a875dc0dabfd8d28273f6abb38fc2 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-4.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-4.json
@@ -199,10 +199,11 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
- "max_walltime": 0,
+ "max_walltime": 604800,
"queues": [
+ "abaca",
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-5.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-5.json
index 4fefc12d56e6e7527903705236f7840761b7b46b..b8676a7d10ebb343f4a844e5852839fe77ee48a3 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-5.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-5.json
@@ -199,10 +199,11 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
- "max_walltime": 0,
+ "max_walltime": 604800,
"queues": [
+ "abaca",
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-6.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-6.json
index b753d9ea799f3bb52e2bf9f525d5b874bb032c52..4db8d6b803bedb6cb247844d96cfe21d60d3376a 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-6.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-6.json
@@ -199,10 +199,11 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
- "max_walltime": 0,
+ "max_walltime": 604800,
"queues": [
+ "abaca",
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-7.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-7.json
index c0f76461558bf74aab4c856c84762d79ed528a46..21e50ee730ac6ad840510e25cd832fba892fbbd7 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-7.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-7.json
@@ -199,10 +199,11 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
- "max_walltime": 0,
+ "max_walltime": 604800,
"queues": [
+ "abaca",
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-8.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-8.json
index ce9d0bf3a34514e09a14ebc1101e11f38055a525..a6920153dabf4f9b2c8cb01e30ef76d06ccb45b3 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-8.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-8.json
@@ -199,10 +199,11 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
- "max_walltime": 0,
+ "max_walltime": 604800,
"queues": [
+ "abaca",
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-9.json b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-9.json
index 320888de52c0a815b3e20da29e41672bf7b3c728..2b5cb4e42adf1a5ee61e95a7a4d988a50c13084d 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-9.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour3/nodes/mercantour3-9.json
@@ -199,10 +199,11 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
- "max_walltime": 0,
+ "max_walltime": 604800,
"queues": [
+ "abaca",
"admin",
- "testing"
+ "production"
],
"virtual": "ivt"
},
diff --git a/input/grid5000/access/sophia.yaml b/input/grid5000/access/sophia.yaml
index ad1145e6da5714e92eee3b63c121cb10aa0c828b..9fbe316081082fa03694ea17f94394a4a0fdd18e 100644
--- a/input/grid5000/access/sophia.yaml
+++ b/input/grid5000/access/sophia.yaml
@@ -16,6 +16,7 @@ mercantour2: &inria-sophia
esterel10: *inria-sophia
esterel27: *inria-sophia
mercantour1: *inria-sophia
+mercantour3: *inria-sophia
mercantour4: *inria-sophia
mercantour5: *inria-sophia
diff --git a/input/grid5000/sites/sophia/clusters/mercantour3/mercantour3.yaml b/input/grid5000/sites/sophia/clusters/mercantour3/mercantour3.yaml
index 2d2f87d78c51f372f6e1ce2e526d3fb1157b06ed..35770752fd6101148629aab9ae9470ff14fc3600 100644
--- a/input/grid5000/sites/sophia/clusters/mercantour3/mercantour3.yaml
+++ b/input/grid5000/sites/sophia/clusters/mercantour3/mercantour3.yaml
@@ -6,13 +6,13 @@ boot_type: bios
exotic: false
queues:
- admin
- - testing
+ - production
nodes:
mercantour3-[1-16]:
supported_job_types:
deploy: true
besteffort: true
- max_walltime: 0
+ max_walltime: 604800
processor:
microarchitecture: Skylake-SP
clock_speed: 2_200_000_000