From 5032111f10d67595d7156a33b664a8e6fd5c7c42 Mon Sep 17 00:00:00 2001 From: Lucas Nussbaum <lucas.nussbaum@inria.fr> Date: Tue, 18 Mar 2025 16:44:28 +0100 Subject: [PATCH] [vercors2] add dell product data --- .../grenoble/clusters/vercors2/nodes/vercors2-1.json | 4 ++-- .../grenoble/clusters/vercors2/nodes/vercors2-2.json | 4 ++-- .../sites/grenoble/clusters/vercors2/vercors2.json | 6 +++--- input/grid5000/dell-product-data.yaml | 10 ++++++++++ .../sites/grenoble/clusters/vercors2/vercors2.yaml | 3 --- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json index f780473352b..955d20335e4 100644 --- a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json +++ b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json @@ -13,11 +13,11 @@ }, "bmc_version": "2.40.40.40", "chassis": { - "manufactured_at": "1970-01-01", + "manufactured_at": "2016-10-24", "manufacturer": "Dell Inc.", "name": "PowerEdge R730", "serial": "J6P7DD2", - "warranty_end": "1970-01-01" + "warranty_end": "2021-10-23" }, "exotic": false, "gpu_devices": { diff --git a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json index 007ee2e0123..8c45e696808 100644 --- a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json +++ b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json @@ -13,11 +13,11 @@ }, "bmc_version": "2.40.40.40", "chassis": { - "manufactured_at": "1970-01-01", + "manufactured_at": "2016-10-24", "manufacturer": "Dell Inc.", "name": "PowerEdge R730", "serial": "J6P8LG2", - "warranty_end": "1970-01-01" + "warranty_end": "2021-10-23" }, "exotic": false, "gpu_devices": { diff --git a/data/grid5000/sites/grenoble/clusters/vercors2/vercors2.json b/data/grid5000/sites/grenoble/clusters/vercors2/vercors2.json index af0a8166265..44029454921 100644 --- a/data/grid5000/sites/grenoble/clusters/vercors2/vercors2.json +++ b/data/grid5000/sites/grenoble/clusters/vercors2/vercors2.json @@ -3,7 +3,7 @@ "created_at": "Tue, 18 Mar 2025 00:00:00 GMT", "exotic": false, "kavlan": false, - "manufactured_at": "1970-01-01", + "manufactured_at": "2016-10-24", "metrics": [ { "description": "Default subset of metrics from Prometheus Node Exporter", @@ -81,7 +81,7 @@ "model": "Dell PowerEdge R730", "nodes_count": 2, "nodes_description": "2 CPUs Intel Xeon E5-2630 v4, 10 cores/CPU, 2 GPUs TITAN X (Pascal), 64GB RAM, 278GB HDD, 3725GB HDD, 1 x 1Gb Ethernet", - "priority": 197101, + "priority": 201710, "queues": [ "admin", "testing" @@ -89,5 +89,5 @@ "redfish": true, "type": "cluster", "uid": "vercors2", - "warranty_end": "1970-01-01" + "warranty_end": "2021-10-23" } \ No newline at end of file diff --git a/input/grid5000/dell-product-data.yaml b/input/grid5000/dell-product-data.yaml index 1e50fc6af36..32bd922f5c7 100644 --- a/input/grid5000/dell-product-data.yaml +++ b/input/grid5000/dell-product-data.yaml @@ -178,6 +178,16 @@ sites: chassis: manufactured_at: 2019-11-21 warranty_end: 2024-11-21 + vercors2: + nodes: + vercors2-1: + chassis: + manufactured_at: 2016-10-24 + warranty_end: 2021-10-23 + vercors2-2: + chassis: + manufactured_at: 2016-10-24 + warranty_end: 2021-10-23 yeti: nodes: yeti-1: diff --git a/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml b/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml index 2504cfa8e8d..6b17e5bdcbd 100644 --- a/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml +++ b/input/grid5000/sites/grenoble/clusters/vercors2/vercors2.yaml @@ -9,9 +9,6 @@ queues: - testing nodes: vercors2-[1-2]: - chassis: - manufactured_at: 1970-01-01 # TODO: if not Dell vendor, put date. if Dell, use rake gen:dell-product-data after g5k-checks import, and remove this line. - warranty_end: 1970-01-01 # TODO: if not Dell vendor, put date. if Dell, use rake gen:dell-product-data after g5k-checks import, and remove this line. supported_job_types: deploy: true besteffort: true -- GitLab