Merge branch 'testing2-mercantour7' into 'master'

[sophia][mercantour7] Add to production queue

See merge request !1187

data/grid5000/accesses/nodesets.json

@@ -2968,6 +2968,61 @@
       ]
     }
   },
+  "mercantour7": {
+    "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": [
+        "calisto"
+      ],
+      "sites": [
+        "mc-staff-site",
+        "g5k-staff-site"
+      ]
+    }
+  },
   "musa": {
     "p1": {
       "ggas": [

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

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

data/grid5000/sites/sophia/clusters/mercantour7/nodes/mercantour7-1.json

@@ -287,10 +287,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

@@ -40,6 +40,10 @@ mercantour6:
     p1: [coati, '@admin']
     besteffort: ['@inria_group', '@other_groups_with_access']
 
+mercantour7: &dedicated-calisto
+    p1: [calisto, '@admin']
+    besteffort: ['@inria_group', '@other_groups_with_access']
+
 esterel41:
     p1: [evergreen, '@admin']
     besteffort: ['@inria_group', '@other_groups_with_access']

input/grid5000/sites/sophia/clusters/mercantour7/mercantour7.yaml

@@ -6,13 +6,13 @@ boot_type: uefi
 exotic: false 
 queues:
   - admin
-  - testing
+  - production
 nodes:
   mercantour7-1:
     supported_job_types:
       deploy: true
       besteffort: true
-      max_walltime: 0
+      max_walltime: 604800
     processor:
       microarchitecture: Zen 2
       clock_speed: 2500000000