From 8974a467267817507f4daa5686073a610c4e409a Mon Sep 17 00:00:00 2001
From: Lucas Nussbaum <lucas.nussbaum@inria.fr>
Date: Wed, 5 Mar 2025 14:16:53 +0100
Subject: [PATCH] [esterel5,mercantour6] move to production
---
data/grid5000/accesses/nodesets.json | 110 ++++++++++++++++++
.../sophia/clusters/esterel5/esterel5.json | 2 +-
.../clusters/esterel5/nodes/esterel5-1.json | 4 +-
.../clusters/esterel5/nodes/esterel5-2.json | 4 +-
.../clusters/mercantour6/mercantour6.json | 2 +-
.../mercantour6/nodes/mercantour6-1.json | 4 +-
input/grid5000/access/sophia.yaml | 8 ++
.../sophia/clusters/esterel5/esterel5.yaml | 4 +-
.../clusters/mercantour6/mercantour6.yaml | 4 +-
9 files changed, 130 insertions(+), 12 deletions(-)
diff --git a/data/grid5000/accesses/nodesets.json b/data/grid5000/accesses/nodesets.json
index 183a64d57d8..7af73cf716f 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 3ae543adf4b..40d5351452f 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 9980ef7c885..279b123d3b6 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 05278213c57..be57458d79d 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 6bdbe4767c6..f71460db0dd 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 14279cc44c4..9bdf00b885f 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 abb9db9347e..9b8946e01c3 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 088128d35cb..77f0b81b9fa 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 ccbc8939329..882f8d3827c 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
--
GitLab