From 8f07f0ab23601a273bbb46ec6d561bfc378ea32c Mon Sep 17 00:00:00 2001 From: Lancelot Doan <lancelot.doan@inria.fr> Date: Wed, 19 Mar 2025 14:29:13 +0100 Subject: [PATCH] [Grenoble][Chartreuse2] Change chartreuse2 from testing to production --- data/grid5000/accesses/nodesets.json | 67 +++++++++++++++++++ .../clusters/chartreuse2/chartreuse2.json | 2 +- .../chartreuse2/nodes/chartreuse2-1.json | 2 +- .../chartreuse2/nodes/chartreuse2-2.json | 2 +- .../chartreuse2/nodes/chartreuse2-3.json | 2 +- .../chartreuse2/nodes/chartreuse2-4.json | 2 +- input/grid5000/access/grenoble.yaml | 7 ++ input/grid5000/access/group.yaml | 3 + .../clusters/chartreuse2/chartreuse2.yaml | 2 +- 9 files changed, 83 insertions(+), 6 deletions(-) create mode 100644 input/grid5000/access/grenoble.yaml diff --git a/data/grid5000/accesses/nodesets.json b/data/grid5000/accesses/nodesets.json index 79437f99161..24d008767a3 100644 --- a/data/grid5000/accesses/nodesets.json +++ b/data/grid5000/accesses/nodesets.json @@ -1470,6 +1470,73 @@ ] } }, + "chartreuse2": { + "p1": { + "ggas": [ + "corse", + "datamove", + "erods", + "nanosim2", + "polaris" + ], + "sites": [ + "mc-grenoble", + "mc-staff-site", + "g5k-staff-site" + ] + }, + "p3": { + "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" + ] + }, + "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" + ] + } + }, "esterel10": { "p1": { "ggas": [ diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.json index 54435993100..016d35b6c27 100644 --- a/data/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.json +++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.json @@ -231,7 +231,7 @@ "priority": 201611, "queues": [ "admin", - "testing" + "production" ], "redfish": true, "type": "cluster", diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.json index 7b232c41372..b8d0340fb0f 100644 --- a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.json +++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.json @@ -203,7 +203,7 @@ "max_walltime": 0, "queues": [ "admin", - "testing" + "production" ], "virtual": "ivt" }, diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.json index 9a6f90181ab..cc6aafaa486 100644 --- a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.json +++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.json @@ -203,7 +203,7 @@ "max_walltime": 0, "queues": [ "admin", - "testing" + "production" ], "virtual": "ivt" }, diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.json index 4087a27c415..1a038ab8d73 100644 --- a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.json +++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.json @@ -203,7 +203,7 @@ "max_walltime": 0, "queues": [ "admin", - "testing" + "production" ], "virtual": "ivt" }, diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.json index 460b713e37e..b36cf8e43cd 100644 --- a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.json +++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.json @@ -203,7 +203,7 @@ "max_walltime": 0, "queues": [ "admin", - "testing" + "production" ], "virtual": "ivt" }, diff --git a/input/grid5000/access/grenoble.yaml b/input/grid5000/access/grenoble.yaml new file mode 100644 index 00000000000..54bacc5845d --- /dev/null +++ b/input/grid5000/access/grenoble.yaml @@ -0,0 +1,7 @@ +# This is an input file of reference-repository.git/generators/puppet/accesses.rb +--- + +chartreuse2: &inria-grenoble + p1: ['@inria_grenoble_group', '@admin'] + p3: ['@inria_group'] + p4: ['@other_groups_with_access'] diff --git a/input/grid5000/access/group.yaml b/input/grid5000/access/group.yaml index dce252466ee..63b66ba1368 100644 --- a/input/grid5000/access/group.yaml +++ b/input/grid5000/access/group.yaml @@ -24,6 +24,9 @@ inria_nancy_group: ['%mc-nancy', coast] ## mc group of inria lyon, also include some slices-fr groups inria_lyon_group: ['%mc-lyon', avalon, chroma, emeraude, maracas ] +## mc group of inria grenoble, also include some slices-fr groups +inria_grenoble_group: ['%mc-grenoble', corse, datamove, erods, nanosim2, polaris] + # GROUP FOR ALL INRIA ## group of guest site that have access to inria mc with the same level as other inria team guest_inria: [inria-chile, inria-dsi, inria-sidf, swh, tadaam] diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.yaml index 268192ecfdd..9fe7f0095e5 100644 --- a/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.yaml +++ b/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.yaml @@ -6,7 +6,7 @@ boot_type: bios exotic: false queues: - admin - - testing + - production nodes: chartreuse2-[1-4]: supported_job_types: -- GitLab