diff --git a/data/grid5000/accesses/nodesets.json b/data/grid5000/accesses/nodesets.json
index 183a64d57d8d818f5caaf960f50c5f77b86feeda..7af73cf716fd1f5363ea6f7a9483088ad7ec8ca0 100644
--- a/data/grid5000/accesses/nodesets.json
+++ b/data/grid5000/accesses/nodesets.json
@@ -1480,6 +1480,61 @@
]
}
},
+ "esterel5": {
+ "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": [
+ "stars"
+ ],
+ "sites": [
+ "mc-staff-site",
+ "g5k-staff-site"
+ ]
+ }
+ },
"graffiti": {
"p1": {
"ggas": [
@@ -2384,6 +2439,61 @@
]
}
},
+ "mercantour6": {
+ "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": [
+ "coati"
+ ],
+ "sites": [
+ "mc-staff-site",
+ "g5k-staff-site"
+ ]
+ }
+ },
"musa": {
"p1": {
"ggas": [
diff --git a/data/grid5000/sites/sophia/clusters/esterel5/esterel5.json b/data/grid5000/sites/sophia/clusters/esterel5/esterel5.json
index 3ae543adf4b437f84602b8c53204247890c07716..40d5351452f6e8914e984952544b6ced422a4f0a 100644
--- a/data/grid5000/sites/sophia/clusters/esterel5/esterel5.json
+++ b/data/grid5000/sites/sophia/clusters/esterel5/esterel5.json
@@ -84,7 +84,7 @@
"priority": 201706,
"queues": [
"admin",
- "testing"
+ "production"
],
"redfish": true,
"type": "cluster",
diff --git a/data/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-1.json b/data/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-1.json
index 9980ef7c885944cadbd3a5876b6b16cf3adf2b18..279b123d3b6422643ef7cc502b58b311a3b80947 100644
--- a/data/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-1.json
@@ -260,10 +260,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/esterel5/nodes/esterel5-2.json b/data/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-2.json
index 05278213c575621fa16e3a084147a8eb50f6f562..be57458d79d7da741bbc603d0a6a2452a92aa643 100644
--- a/data/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-2.json
+++ b/data/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-2.json
@@ -260,10 +260,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/mercantour6/mercantour6.json b/data/grid5000/sites/sophia/clusters/mercantour6/mercantour6.json
index 6bdbe4767c62d9ac377cc1603fbd69dfab0b764f..f71460db0dd7b0f886b16bac223fa957978a4578 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour6/mercantour6.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour6/mercantour6.json
@@ -57,7 +57,7 @@
"priority": 202010,
"queues": [
"admin",
- "testing"
+ "production"
],
"redfish": true,
"type": "cluster",
diff --git a/data/grid5000/sites/sophia/clusters/mercantour6/nodes/mercantour6-1.json b/data/grid5000/sites/sophia/clusters/mercantour6/nodes/mercantour6-1.json
index 14279cc44c4b5d279cee3cfe6b61893be3d760e2..9bdf00b885f7d8d3d9f9f725c08f84e36122e6d3 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour6/nodes/mercantour6-1.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour6/nodes/mercantour6-1.json
@@ -247,10 +247,10 @@
"supported_job_types": {
"besteffort": true,
"deploy": true,
- "max_walltime": 0,
+ "max_walltime": 604800,
"queues": [
"admin",
- "testing"
+ "production"
],
"virtual": "amd-v"
},
diff --git a/input/grid5000/access/sophia.yaml b/input/grid5000/access/sophia.yaml
index abb9db9347e5180ba4d14668a8a7bbc43e56afe6..9b8946e01c3468318b5ee144899e823706e5a45f 100644
--- a/input/grid5000/access/sophia.yaml
+++ b/input/grid5000/access/sophia.yaml
@@ -16,6 +16,14 @@ mercantour2: &inria-sophia
esterel10: *inria-sophia
# DEDICATED MODE
+esterel5:
+ p1: [stars, '@admin']
+ besteffort: ['@inria_group', '@other_groups_with_access']
+
+mercantour6:
+ p1: [coati, '@admin']
+ besteffort: ['@inria_group', '@other_groups_with_access']
+
esterel41:
p1: [evergreen, '@admin']
besteffort: ['@inria_group', '@other_groups_with_access']
diff --git a/input/grid5000/sites/sophia/clusters/esterel5/esterel5.yaml b/input/grid5000/sites/sophia/clusters/esterel5/esterel5.yaml
index 088128d35cbd4dbf6e61d18b2ec7950499176b0b..77f0b81b9fa7404345e98401f1f391dc3d6569de 100644
--- a/input/grid5000/sites/sophia/clusters/esterel5/esterel5.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel5/esterel5.yaml
@@ -6,13 +6,13 @@ boot_type: bios
exotic: false
queues:
- admin
- - testing
+ - production
nodes:
esterel5-[1-2]:
supported_job_types:
deploy: true
besteffort: true
- max_walltime: 0
+ max_walltime: 604800
processor:
microarchitecture: Broadwell
clock_speed: 2200000000
diff --git a/input/grid5000/sites/sophia/clusters/mercantour6/mercantour6.yaml b/input/grid5000/sites/sophia/clusters/mercantour6/mercantour6.yaml
index ccbc8939329c361f709e4ca95abf5608883c61fc..882f8d3827c1ae0a350b9eb376fa92078c8164ac 100644
--- a/input/grid5000/sites/sophia/clusters/mercantour6/mercantour6.yaml
+++ b/input/grid5000/sites/sophia/clusters/mercantour6/mercantour6.yaml
@@ -6,13 +6,13 @@ boot_type: bios
exotic: false
queues:
- admin
- - testing
+ - production
nodes:
mercantour6-1:
supported_job_types:
deploy: true
besteffort: true
- max_walltime: 0
+ max_walltime: 604800
processor:
microarchitecture: 'Zen 2'
clock_speed: 2900000000