Merge branch 'est5_merc6_prod' into 'master'

[esterel5,mercantour6] move to production

See merge request !1067

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": [

data/grid5000/sites/sophia/clusters/esterel5/esterel5.json

@@ -84,7 +84,7 @@
   "priority": 201706,
   "queues": [
     "admin",
-    "testing"
+    "production"
   ],
   "redfish": true,
   "type": "cluster",

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"
   },

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"
   },

data/grid5000/sites/sophia/clusters/mercantour6/mercantour6.json

@@ -57,7 +57,7 @@
   "priority": 202010,
   "queues": [
     "admin",
-    "testing"
+    "production"
   ],
   "redfish": true,
   "type": "cluster",

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"
   },

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']

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

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