From e1824c2f3f9f174e4e4250ad9ae23e556be20b57 Mon Sep 17 00:00:00 2001
From: Nicolas Perrin <nicolas.perrin@inria.fr>
Date: Fri, 21 Feb 2025 14:35:28 +0100
Subject: [PATCH 1/6] [sophia][mercantour5] add basic metrics
---
.../clusters/mercantour5/mercantour5.json | 64 +++++++++++++++++++
.../mercantour5/mercantour5_metrics.yaml | 42 ++++++++++++
2 files changed, 106 insertions(+)
create mode 100644 data/grid5000/sites/sophia/clusters/mercantour5/mercantour5.json
create mode 100644 input/grid5000/sites/sophia/clusters/mercantour5/mercantour5_metrics.yaml
diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/mercantour5.json b/data/grid5000/sites/sophia/clusters/mercantour5/mercantour5.json
new file mode 100644
index 00000000000..52a070647c3
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/mercantour5.json
@@ -0,0 +1,64 @@
+{
+ "boot_type": "uefi",
+ "created_at": "Thu, 01 Jan 1970 00:00:00 GMT",
+ "exotic": false,
+ "kavlan": false,
+ "manufactured_at": "1970-01-01",
+ "metrics": [
+ {
+ "description": "Default subset of metrics from Prometheus Node Exporter",
+ "name": "prom_default_metrics",
+ "optional_period": 15000,
+ "period": 0,
+ "source": {
+ "id": [
+ "node_boot_time_seconds",
+ "node_cpu_scaling_frequency_hertz",
+ "node_cpu_seconds_total",
+ "node_filesystem_free_bytes",
+ "node_filesystem_size_bytes",
+ "node_load1",
+ "node_load15",
+ "node_load5",
+ "node_memory_Buffers_bytes",
+ "node_memory_Cached_bytes",
+ "node_memory_MemAvailable_bytes",
+ "node_memory_MemFree_bytes",
+ "node_memory_MemTotal_bytes",
+ "node_memory_Shmem_bytes",
+ "node_memory_SwapFree_bytes",
+ "node_memory_SwapTotal_bytes",
+ "node_network_receive_bytes_total",
+ "node_network_receive_packets_total",
+ "node_network_transmit_bytes_total",
+ "node_network_transmit_packets_total",
+ "node_procs_blocked",
+ "node_procs_running",
+ "kwollect_custom"
+ ],
+ "port": 9100,
+ "protocol": "prometheus"
+ }
+ },
+ {
+ "description": "All metrics from Prometheus Node Exporter",
+ "name": "prom_all_metrics",
+ "optional_period": 15000,
+ "period": 0,
+ "source": {
+ "port": 9100,
+ "protocol": "prometheus"
+ }
+ }
+ ],
+ "model": "Cluster Model",
+ "priority": 197001,
+ "queues": [
+ "admin",
+ "testing"
+ ],
+ "redfish": true,
+ "type": "cluster",
+ "uid": "mercantour5",
+ "warranty_end": "1970-01-01"
+}
\ No newline at end of file
diff --git a/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5_metrics.yaml b/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5_metrics.yaml
new file mode 100644
index 00000000000..3c11d0073c1
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5_metrics.yaml
@@ -0,0 +1,42 @@
+---
+metrics:
+
+ - name: prom_default_metrics
+ description: Default subset of metrics from Prometheus Node Exporter
+ period: 0
+ optional_period: 15000
+ source:
+ protocol: prometheus
+ port: 9100
+ id:
+ - node_boot_time_seconds
+ - node_cpu_scaling_frequency_hertz
+ - node_cpu_seconds_total
+ - node_filesystem_free_bytes
+ - node_filesystem_size_bytes
+ - node_load1
+ - node_load15
+ - node_load5
+ - node_memory_Buffers_bytes
+ - node_memory_Cached_bytes
+ - node_memory_MemAvailable_bytes
+ - node_memory_MemFree_bytes
+ - node_memory_MemTotal_bytes
+ - node_memory_Shmem_bytes
+ - node_memory_SwapFree_bytes
+ - node_memory_SwapTotal_bytes
+ - node_network_receive_bytes_total
+ - node_network_receive_packets_total
+ - node_network_transmit_bytes_total
+ - node_network_transmit_packets_total
+ - node_procs_blocked
+ - node_procs_running
+ - kwollect_custom
+
+ - name: prom_all_metrics
+ description: All metrics from Prometheus Node Exporter
+ period: 0
+ optional_period: 15000
+ source:
+ protocol: prometheus
+ port: 9100
--
GitLab
From ff8b680a8c31eadc6c3c4bf579dbf0f9f4d888e9 Mon Sep 17 00:00:00 2001
From: Nathan Paulin <nathan.paulin@inria.fr>
Date: Mon, 24 Feb 2025 09:54:28 +0100
Subject: [PATCH 2/6] [sophia][mercantour5] add basic conf
---
.../clusters/mercantour5/mercantour5.json | 12 +-
.../mercantour5/nodes/mercantour5-1.json | 128 ++++++++++++++++++
.../mercantour5/nodes/mercantour5-2.json | 128 ++++++++++++++++++
.../mercantour5/nodes/mercantour5-3.json | 128 ++++++++++++++++++
.../mercantour5/nodes/mercantour5-4.json | 128 ++++++++++++++++++
.../clusters/mercantour5/mercantour5.yaml | 41 ++++++
.../clusters/mercantour5/nodes.yaml.erb | 86 ++++++++++++
lib/refrepo/input_loader.rb | 2 +-
8 files changed, 646 insertions(+), 7 deletions(-)
create mode 100644 data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.json
create mode 100644 data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.json
create mode 100644 data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.json
create mode 100644 data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.json
create mode 100644 input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml
create mode 100644 input/grid5000/sites/sophia/clusters/mercantour5/nodes.yaml.erb
diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/mercantour5.json b/data/grid5000/sites/sophia/clusters/mercantour5/mercantour5.json
index 52a070647c3..bddb65c0308 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour5/mercantour5.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/mercantour5.json
@@ -1,9 +1,9 @@
{
- "boot_type": "uefi",
- "created_at": "Thu, 01 Jan 1970 00:00:00 GMT",
+ "boot_type": "bios",
+ "created_at": "Mon, 24 Feb 2025 00:00:00 GMT",
"exotic": false,
"kavlan": false,
- "manufactured_at": "1970-01-01",
+ "manufactured_at": "2019-07-30",
"metrics": [
{
"description": "Default subset of metrics from Prometheus Node Exporter",
@@ -51,8 +51,8 @@
}
}
],
- "model": "Cluster Model",
- "priority": 197001,
+ "model": "Dell PowerEdge C6420",
+ "priority": 201907,
"queues": [
"admin",
"testing"
@@ -60,5 +60,5 @@
"redfish": true,
"type": "cluster",
"uid": "mercantour5",
- "warranty_end": "1970-01-01"
+ "warranty_end": "2026-07-31"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.json b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.json
new file mode 100644
index 00000000000..bb1974a1617
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.json
@@ -0,0 +1,128 @@
+{
+ "architecture": {
+ "cpu_core_numbering": "contiguous",
+ "nb_cores": 72,
+ "nb_procs": 1,
+ "nb_threads": 72,
+ "platform_type": "x86_64"
+ },
+ "bios": {
+ "release_date": "01/01/2000",
+ "vendor": "Unknown",
+ "version": 1
+ },
+ "bmc_version": "v1",
+ "chassis": {
+ "manufactured_at": "2019-07-30",
+ "manufacturer": "Unknown",
+ "name": "Unknown",
+ "warranty_end": "2026-07-31"
+ },
+ "exotic": false,
+ "main_memory": {
+ "ram_size": 8
+ },
+ "management_tools": {
+ "bmc_vendor_tool": "racadm",
+ "ipmitool": {
+ "retries": 5
+ }
+ },
+ "memory_devices": [
+ {
+ "device": "dimm_proc 1 dimm 1",
+ "size": 8,
+ "technology": "dram"
+ }
+ ],
+ "network_adapters": [
+ {
+ "device": "eth0",
+ "driver": "mlx_core",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.16.130.42",
+ "ip6": "2001:660:4406:800:3::2a",
+ "kavlan": false,
+ "mac": "6c:2b:59:9c:4a:32",
+ "management": false,
+ "mountable": true,
+ "mounted": true,
+ "name": "enp1s0f0np0",
+ "network_address": "mercantour5-1.sophia.grid5000.fr",
+ "rate": 10000000000,
+ "switch": null,
+ "switch_port": null
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.130.42",
+ "kavlan": false,
+ "mac": "6c:2b:59:9c:48:65",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "mercantour5-1-bmc.sophia.grid5000.fr"
+ }
+ ],
+ "nodeset": "mercantour5",
+ "operating_system": {
+ "cstate_driver": "unknown",
+ "cstate_governor": "unknown",
+ "ht_enabled": true,
+ "pstate_driver": "unknwon",
+ "pstate_governor": "unknown",
+ "turboboost_enabled": true
+ },
+ "performance": {
+ "core_flops": 83200000000,
+ "node_flops": 5990400000000
+ },
+ "processor": {
+ "cache_l1": null,
+ "cache_l1d": 8,
+ "cache_l1i": 8,
+ "cache_l2": 8,
+ "cache_l3": 8,
+ "clock_speed": 2600000000,
+ "ht_capable": true,
+ "instruction_set": "x86-64",
+ "microarchitecture": "Cascade Lake-SP",
+ "microcode": "0xd000001",
+ "model": "Intel Xeon",
+ "other_description": "Intel(R) Xeon(R) Gold 6240 CPU @ 2.60GHz",
+ "vendor": "Intel",
+ "version": "Gold 6240"
+ },
+ "redfish": true,
+ "software": {
+ "forced-deployment-timestamp": 202007300948,
+ "postinstall-version": "1.2025021810",
+ "standard-environment": "debian11-x64-std"
+ },
+ "storage_devices": [
+ {
+ "by_id": "",
+ "by_path": "/dev/disk/by-path/dummy",
+ "id": "disk0",
+ "interface": "SAS",
+ "model": "unknown",
+ "size": 8,
+ "storage": "SSD",
+ "vendor": "Unknown"
+ }
+ ],
+ "supported_job_types": {
+ "besteffort": true,
+ "deploy": true,
+ "max_walltime": 0,
+ "queues": [
+ "admin",
+ "testing"
+ ]
+ },
+ "type": "node",
+ "uid": "mercantour5-1"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.json b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.json
new file mode 100644
index 00000000000..79b99ddc600
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.json
@@ -0,0 +1,128 @@
+{
+ "architecture": {
+ "cpu_core_numbering": "contiguous",
+ "nb_cores": 72,
+ "nb_procs": 1,
+ "nb_threads": 72,
+ "platform_type": "x86_64"
+ },
+ "bios": {
+ "release_date": "01/01/2000",
+ "vendor": "Unknown",
+ "version": 1
+ },
+ "bmc_version": "v1",
+ "chassis": {
+ "manufactured_at": "2019-07-30",
+ "manufacturer": "Unknown",
+ "name": "Unknown",
+ "warranty_end": "2026-07-31"
+ },
+ "exotic": false,
+ "main_memory": {
+ "ram_size": 8
+ },
+ "management_tools": {
+ "bmc_vendor_tool": "racadm",
+ "ipmitool": {
+ "retries": 5
+ }
+ },
+ "memory_devices": [
+ {
+ "device": "dimm_proc 1 dimm 1",
+ "size": 8,
+ "technology": "dram"
+ }
+ ],
+ "network_adapters": [
+ {
+ "device": "eth0",
+ "driver": "mlx_core",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.16.130.43",
+ "ip6": "2001:660:4406:800:3::2b",
+ "kavlan": false,
+ "mac": "6c:2b:59:9c:3f:3a",
+ "management": false,
+ "mountable": true,
+ "mounted": true,
+ "name": "enp1s0f0np0",
+ "network_address": "mercantour5-2.sophia.grid5000.fr",
+ "rate": 10000000000,
+ "switch": null,
+ "switch_port": null
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.130.43",
+ "kavlan": false,
+ "mac": "6c:2b:59:9c:3c:51",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "mercantour5-2-bmc.sophia.grid5000.fr"
+ }
+ ],
+ "nodeset": "mercantour5",
+ "operating_system": {
+ "cstate_driver": "unknown",
+ "cstate_governor": "unknown",
+ "ht_enabled": true,
+ "pstate_driver": "unknwon",
+ "pstate_governor": "unknown",
+ "turboboost_enabled": true
+ },
+ "performance": {
+ "core_flops": 83200000000,
+ "node_flops": 5990400000000
+ },
+ "processor": {
+ "cache_l1": null,
+ "cache_l1d": 8,
+ "cache_l1i": 8,
+ "cache_l2": 8,
+ "cache_l3": 8,
+ "clock_speed": 2600000000,
+ "ht_capable": true,
+ "instruction_set": "x86-64",
+ "microarchitecture": "Cascade Lake-SP",
+ "microcode": "0xd000001",
+ "model": "Intel Xeon",
+ "other_description": "Intel(R) Xeon(R) Gold 6240 CPU @ 2.60GHz",
+ "vendor": "Intel",
+ "version": "Gold 6240"
+ },
+ "redfish": true,
+ "software": {
+ "forced-deployment-timestamp": 202007300948,
+ "postinstall-version": "1.2025021810",
+ "standard-environment": "debian11-x64-std"
+ },
+ "storage_devices": [
+ {
+ "by_id": "",
+ "by_path": "/dev/disk/by-path/dummy",
+ "id": "disk0",
+ "interface": "SAS",
+ "model": "unknown",
+ "size": 8,
+ "storage": "SSD",
+ "vendor": "Unknown"
+ }
+ ],
+ "supported_job_types": {
+ "besteffort": true,
+ "deploy": true,
+ "max_walltime": 0,
+ "queues": [
+ "admin",
+ "testing"
+ ]
+ },
+ "type": "node",
+ "uid": "mercantour5-2"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.json b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.json
new file mode 100644
index 00000000000..0ed9dc86f5f
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.json
@@ -0,0 +1,128 @@
+{
+ "architecture": {
+ "cpu_core_numbering": "contiguous",
+ "nb_cores": 72,
+ "nb_procs": 1,
+ "nb_threads": 72,
+ "platform_type": "x86_64"
+ },
+ "bios": {
+ "release_date": "01/01/2000",
+ "vendor": "Unknown",
+ "version": 1
+ },
+ "bmc_version": "v1",
+ "chassis": {
+ "manufactured_at": "2019-07-30",
+ "manufacturer": "Unknown",
+ "name": "Unknown",
+ "warranty_end": "2026-07-31"
+ },
+ "exotic": false,
+ "main_memory": {
+ "ram_size": 8
+ },
+ "management_tools": {
+ "bmc_vendor_tool": "racadm",
+ "ipmitool": {
+ "retries": 5
+ }
+ },
+ "memory_devices": [
+ {
+ "device": "dimm_proc 1 dimm 1",
+ "size": 8,
+ "technology": "dram"
+ }
+ ],
+ "network_adapters": [
+ {
+ "device": "eth0",
+ "driver": "mlx_core",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.16.130.44",
+ "ip6": "2001:660:4406:800:3::2c",
+ "kavlan": false,
+ "mac": "6c:2b:59:9c:4a:6d",
+ "management": false,
+ "mountable": true,
+ "mounted": true,
+ "name": "enp1s0f0np0",
+ "network_address": "mercantour5-3.sophia.grid5000.fr",
+ "rate": 10000000000,
+ "switch": null,
+ "switch_port": null
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.130.44",
+ "kavlan": false,
+ "mac": "6c:2b:59:9c:46:df",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "mercantour5-3-bmc.sophia.grid5000.fr"
+ }
+ ],
+ "nodeset": "mercantour5",
+ "operating_system": {
+ "cstate_driver": "unknown",
+ "cstate_governor": "unknown",
+ "ht_enabled": true,
+ "pstate_driver": "unknwon",
+ "pstate_governor": "unknown",
+ "turboboost_enabled": true
+ },
+ "performance": {
+ "core_flops": 83200000000,
+ "node_flops": 5990400000000
+ },
+ "processor": {
+ "cache_l1": null,
+ "cache_l1d": 8,
+ "cache_l1i": 8,
+ "cache_l2": 8,
+ "cache_l3": 8,
+ "clock_speed": 2600000000,
+ "ht_capable": true,
+ "instruction_set": "x86-64",
+ "microarchitecture": "Cascade Lake-SP",
+ "microcode": "0xd000001",
+ "model": "Intel Xeon",
+ "other_description": "Intel(R) Xeon(R) Gold 6240 CPU @ 2.60GHz",
+ "vendor": "Intel",
+ "version": "Gold 6240"
+ },
+ "redfish": true,
+ "software": {
+ "forced-deployment-timestamp": 202007300948,
+ "postinstall-version": "1.2025021810",
+ "standard-environment": "debian11-x64-std"
+ },
+ "storage_devices": [
+ {
+ "by_id": "",
+ "by_path": "/dev/disk/by-path/dummy",
+ "id": "disk0",
+ "interface": "SAS",
+ "model": "unknown",
+ "size": 8,
+ "storage": "SSD",
+ "vendor": "Unknown"
+ }
+ ],
+ "supported_job_types": {
+ "besteffort": true,
+ "deploy": true,
+ "max_walltime": 0,
+ "queues": [
+ "admin",
+ "testing"
+ ]
+ },
+ "type": "node",
+ "uid": "mercantour5-3"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.json b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.json
new file mode 100644
index 00000000000..7e445bb9d97
--- /dev/null
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.json
@@ -0,0 +1,128 @@
+{
+ "architecture": {
+ "cpu_core_numbering": "contiguous",
+ "nb_cores": 72,
+ "nb_procs": 1,
+ "nb_threads": 72,
+ "platform_type": "x86_64"
+ },
+ "bios": {
+ "release_date": "01/01/2000",
+ "vendor": "Unknown",
+ "version": 1
+ },
+ "bmc_version": "v1",
+ "chassis": {
+ "manufactured_at": "2019-07-30",
+ "manufacturer": "Unknown",
+ "name": "Unknown",
+ "warranty_end": "2026-07-31"
+ },
+ "exotic": false,
+ "main_memory": {
+ "ram_size": 8
+ },
+ "management_tools": {
+ "bmc_vendor_tool": "racadm",
+ "ipmitool": {
+ "retries": 5
+ }
+ },
+ "memory_devices": [
+ {
+ "device": "dimm_proc 1 dimm 1",
+ "size": 8,
+ "technology": "dram"
+ }
+ ],
+ "network_adapters": [
+ {
+ "device": "eth0",
+ "driver": "mlx_core",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.16.130.45",
+ "ip6": "2001:660:4406:800:3::2d",
+ "kavlan": false,
+ "mac": "6c:2b:59:9a:05:c4",
+ "management": false,
+ "mountable": true,
+ "mounted": true,
+ "name": "enp1s0f0np0",
+ "network_address": "mercantour5-4.sophia.grid5000.fr",
+ "rate": 10000000000,
+ "switch": null,
+ "switch_port": null
+ },
+ {
+ "device": "bmc",
+ "enabled": true,
+ "interface": "Ethernet",
+ "ip": "172.17.130.45",
+ "kavlan": false,
+ "mac": "6c:2b:59:99:fd:38",
+ "management": true,
+ "mountable": false,
+ "mounted": false,
+ "network_address": "mercantour5-4-bmc.sophia.grid5000.fr"
+ }
+ ],
+ "nodeset": "mercantour5",
+ "operating_system": {
+ "cstate_driver": "unknown",
+ "cstate_governor": "unknown",
+ "ht_enabled": true,
+ "pstate_driver": "unknwon",
+ "pstate_governor": "unknown",
+ "turboboost_enabled": true
+ },
+ "performance": {
+ "core_flops": 83200000000,
+ "node_flops": 5990400000000
+ },
+ "processor": {
+ "cache_l1": null,
+ "cache_l1d": 8,
+ "cache_l1i": 8,
+ "cache_l2": 8,
+ "cache_l3": 8,
+ "clock_speed": 2600000000,
+ "ht_capable": true,
+ "instruction_set": "x86-64",
+ "microarchitecture": "Cascade Lake-SP",
+ "microcode": "0xd000001",
+ "model": "Intel Xeon",
+ "other_description": "Intel(R) Xeon(R) Gold 6240 CPU @ 2.60GHz",
+ "vendor": "Intel",
+ "version": "Gold 6240"
+ },
+ "redfish": true,
+ "software": {
+ "forced-deployment-timestamp": 202007300948,
+ "postinstall-version": "1.2025021810",
+ "standard-environment": "debian11-x64-std"
+ },
+ "storage_devices": [
+ {
+ "by_id": "",
+ "by_path": "/dev/disk/by-path/dummy",
+ "id": "disk0",
+ "interface": "SAS",
+ "model": "unknown",
+ "size": 8,
+ "storage": "SSD",
+ "vendor": "Unknown"
+ }
+ ],
+ "supported_job_types": {
+ "besteffort": true,
+ "deploy": true,
+ "max_walltime": 0,
+ "queues": [
+ "admin",
+ "testing"
+ ]
+ },
+ "type": "node",
+ "uid": "mercantour5-4"
+}
\ No newline at end of file
diff --git a/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml b/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml
new file mode 100644
index 00000000000..2a0277f4a7d
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml
@@ -0,0 +1,41 @@
+---
+model: Dell PowerEdge C6420
+created_at: 2025-02-24
+kavlan: false #TO DO AFTER
+boot_type: bios
+exotic: false
+queues:
+ - admin
+ - testing
+nodes:
+ mercantour5-[1-4]:
+ chassis:
+ manufactured_at: 2019-07-30
+ warranty_end: 2026-07-31
+ supported_job_types:
+ deploy: true
+ besteffort: true
+ max_walltime: 0
+ processor:
+ microarchitecture: Cascade Lake-SP
+ clock_speed: 2_600_000_000
+ network_adapters:
+ bmc:
+ interface: Ethernet
+ enabled: true
+ mountable: false
+ mounted: false
+ eth0:
+ enabled: true
+ mountable: true
+ mounted: true
+ storage_devices:
+ disk0: # This field will have to be renamed later.
+ id: disk0
+ interface: SAS
+ by_path: "/dev/disk/by-path/dummy" # this path will have to change later.
+ software:
+ standard-environment: debian11-x64-std
+ management_tools:
+ bmc_vendor_tool: racadm
+ nodeset: mercantour5
diff --git a/input/grid5000/sites/sophia/clusters/mercantour5/nodes.yaml.erb b/input/grid5000/sites/sophia/clusters/mercantour5/nodes.yaml.erb
new file mode 100644
index 00000000000..b7c9a0c5b70
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour5/nodes.yaml.erb
@@ -0,0 +1,86 @@
+<%
+ # File generated by 'rake mass:create SRC=doc/sophia-clusters-mass-create-tmp.csv
+ # If changes are needed, it might be better to edit the source data and regenerate using 'rake mass:create'
+
+ cluster_name = "mercantour5"
+ nodes_number = 4 # Size of the cluster (number of nodes)
+ # MAC addresses declaration
+ mac_eth0_list = %w(
+6c:2b:59:9c:4a:32
+6c:2b:59:9c:3f:3a
+6c:2b:59:9c:4a:6d
+6c:2b:59:9a:05:c4
+ )
+ mac_bmc_list = %w(
+6c:2b:59:9c:48:65
+6c:2b:59:9c:3c:51
+6c:2b:59:9c:46:df
+6c:2b:59:99:fd:38
+ )
+%>
+---
+nodes:
+<% (1..nodes_number).each { |i| %>
+ <%= cluster_name %>-<%= i %>:
+ architecture:
+ nb_procs: 1 # Fake data, will be replaced by g5k-checks
+ nb_cores: 72 # Fake data, will be replaced by g5k-checks
+ nb_threads: 72 # Fake data, will be replaced by g5k-checks
+ platform_type: x86_64 # Fake data, will be replaced by g5k-checks
+ cpu_core_numbering: contiguous # Fake data, will be replaced by g5k-checks
+ bios:
+ release_date: 01/01/2000 # Fake date, will be replaced by g5k-checks
+ vendor: Unknown # Fake vendor, will be replaced by g5k-checks
+ version: 1 # Fake version, will be replaced by g5k-checks
+ bmc_version: v1 # Fake version, will be replaced by g5k-checks
+ chassis:
+ manufacturer: Unknown # Fake manufacturer, will be replaced by g5k-checks
+ name: Unknown # Fake name, will be replaced by g5k-checks
+ main_memory:
+ ram_size: 8 # Fake size, will be replaced by g5k-checks
+ memory_devices:
+ dimm:
+ size: 8 # Fake size, will be replaced by g5k-checks
+ technology: dram # Common memory technology, will be replaced by g5k-checks
+ processor:
+ model: Intel Xeon # Fake model name, will be replaced by g5k-checks
+ other_description: Intel(R) Xeon(R) Gold 6240 CPU @ 2.60GHz # Fake description, will be replaced by g5k-checks
+ vendor: Intel # Fake vendor, will be replaced by g5k-checks
+ version: Gold 6240 # Fake version, will be replaced by g5k-checks
+ cache_l1d: 8 # Fake cache, will be replaced by g5k-checks
+ cache_l1i: 8 # Fake cache, will be replaced by g5k-checks
+ cache_l2: 8 # Fake cache, will be replaced by g5k-checks
+ cache_l3: 8 # Fake cache, will be replaced by g5k-checks
+ instruction_set: x86-64 # Common instruction set, will be replaced by g5k-checks
+ microcode: "0xd000001" # Fake microcode, will be replaced by g5k-checks
+ ht_capable: true # Default ht capable value, will be replaced by g5k-checks
+ main_memory:
+ ram_size: 8 # Fake ram size, will be replaced by g5k-checks
+ memory_devices:
+ dimm_proc 1 dimm 1: # Fake dimm name, will be replaced by g5k-checks
+ size: 8 # Fake dimm size, will be replaced by g5k-checks
+ technology: dram # Default dimm technology, will be replaced by g5k-checks
+ operating_system:
+ cstate_driver: unknown # Fake driver, will be replaced by g5k-checks
+ cstate_governor: unknown # Fake governor, will be replaced by g5k-checks
+ ht_enabled: true # common value for hyper threading, will be replaced by g5k-checks
+ pstate_driver: unknwon # Fake driver, will be replaced by g5k-checks
+ pstate_governor: unknown # Fake driver, will be replaced by g5k-checks
+ turboboost_enabled: true # Default value for turboboost, will be replaced by g5k-checks
+ network_adapters:
+ bmc:
+ management: true
+ mac: <%= mac_bmc_list[i - 1] %>
+ eth0:
+ interface: Ethernet
+ management: false
+ driver: mlx_core # Fake data, will be replaced by g5k-checks
+ name: enp1s0f0np0 # Fake data, will be replaced by g5k-checks
+ rate: 10000000000 # Fake data, will be replaced by g5k-checks
+ mac: <%= mac_eth0_list[i - 1] %>
+ storage_devices:
+ disk0:
+ storage: SSD # Fake data, will be replaced by g5k-checks
+ model: unknown # Fake data, will be replaced by g5k-checks
+ size: 8 # Fake data, will be replaced by g5k-checks
+<% } %>
diff --git a/lib/refrepo/input_loader.rb b/lib/refrepo/input_loader.rb
index 11daefda2fb..df08b5111e2 100644
--- a/lib/refrepo/input_loader.rb
+++ b/lib/refrepo/input_loader.rb
@@ -744,7 +744,7 @@ def get_flops_per_cycle(microarch, cpu_name, cluster_uid)
case cpu_name
when /Silver 4110/, /Silver 4114/, /Silver 4214/, /Silver 4216/, /Gold 5218/, /Gold 5220/, /Gold 5115/, /Gold 5118/, /Gold 5120/, /Gold 5220R/
return 16
- when /Gold 6126/, /Gold 6130/, /Gold 6142/, /Gold 6154/, /Gold 6248/, /Gold 6254/, /Gold 6240L/
+ when /Gold 6126/, /Gold 6130/, /Gold 6142/, /Gold 6154/, /Gold 6240/, /Gold 6248/, /Gold 6254/, /Gold 6240L/
return 32
end
raise "Error: unknown CPU flop per cycle for #{cpu_name} (cluster #{cluster_uid}), cannot compute flops"
--
GitLab
From a54e48da5db6622d12d7b6fa3d425127f34b1836 Mon Sep 17 00:00:00 2001
From: Nathan Paulin <nathan.paulin@inria.fr>
Date: Mon, 3 Mar 2025 16:07:09 +0100
Subject: [PATCH 3/6] [sophia][mercantour5] add disk config
---
.../clusters/mercantour5/nodes/mercantour5-1.json | 12 +++++++++++-
.../clusters/mercantour5/nodes/mercantour5-2.json | 12 +++++++++++-
.../clusters/mercantour5/nodes/mercantour5-3.json | 12 +++++++++++-
.../clusters/mercantour5/nodes/mercantour5-4.json | 12 +++++++++++-
input/grid5000/disks.yaml | 1 +
.../sophia/clusters/mercantour5/mercantour5.yaml | 8 ++++++--
.../sites/sophia/clusters/mercantour5/nodes.yaml.erb | 4 ++++
7 files changed, 55 insertions(+), 6 deletions(-)
diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.json b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.json
index bb1974a1617..5e1be964c39 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.json
@@ -105,13 +105,23 @@
"storage_devices": [
{
"by_id": "",
- "by_path": "/dev/disk/by-path/dummy",
+ "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:0:0",
"id": "disk0",
"interface": "SAS",
"model": "unknown",
"size": 8,
"storage": "SSD",
"vendor": "Unknown"
+ },
+ {
+ "by_id": "",
+ "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:1:0",
+ "id": "disk1",
+ "interface": "SSD",
+ "model": "unknown",
+ "size": 8,
+ "storage": "SSD",
+ "vendor": "Unknown"
}
],
"supported_job_types": {
diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.json b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.json
index 79b99ddc600..731995a76c6 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.json
@@ -105,13 +105,23 @@
"storage_devices": [
{
"by_id": "",
- "by_path": "/dev/disk/by-path/dummy",
+ "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:0:0",
"id": "disk0",
"interface": "SAS",
"model": "unknown",
"size": 8,
"storage": "SSD",
"vendor": "Unknown"
+ },
+ {
+ "by_id": "",
+ "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:1:0",
+ "id": "disk1",
+ "interface": "SSD",
+ "model": "unknown",
+ "size": 8,
+ "storage": "SSD",
+ "vendor": "Unknown"
}
],
"supported_job_types": {
diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.json b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.json
index 0ed9dc86f5f..eb7aea67984 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.json
@@ -105,13 +105,23 @@
"storage_devices": [
{
"by_id": "",
- "by_path": "/dev/disk/by-path/dummy",
+ "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:0:0",
"id": "disk0",
"interface": "SAS",
"model": "unknown",
"size": 8,
"storage": "SSD",
"vendor": "Unknown"
+ },
+ {
+ "by_id": "",
+ "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:1:0",
+ "id": "disk1",
+ "interface": "SSD",
+ "model": "unknown",
+ "size": 8,
+ "storage": "SSD",
+ "vendor": "Unknown"
}
],
"supported_job_types": {
diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.json b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.json
index 7e445bb9d97..9480be26030 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.json
@@ -105,13 +105,23 @@
"storage_devices": [
{
"by_id": "",
- "by_path": "/dev/disk/by-path/dummy",
+ "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:0:0",
"id": "disk0",
"interface": "SAS",
"model": "unknown",
"size": 8,
"storage": "SSD",
"vendor": "Unknown"
+ },
+ {
+ "by_id": "",
+ "by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:1:0",
+ "id": "disk1",
+ "interface": "SSD",
+ "model": "unknown",
+ "size": 8,
+ "storage": "SSD",
+ "vendor": "Unknown"
}
],
"supported_job_types": {
diff --git a/input/grid5000/disks.yaml b/input/grid5000/disks.yaml
index 1d411c3ef89..0013acdb5cc 100644
--- a/input/grid5000/disks.yaml
+++ b/input/grid5000/disks.yaml
@@ -45,6 +45,7 @@ disk_vendor_model_mapping:
- ST600MM0088
- ST600MP0005
- ST600MP0036
+ - ST600MM0069
- ST2000NX0463
- ST4000NM0295
- ST8000NM0185
diff --git a/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml b/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml
index 2a0277f4a7d..243fbba8a3f 100644
--- a/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml
+++ b/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml
@@ -30,10 +30,14 @@ nodes:
mountable: true
mounted: true
storage_devices:
- disk0: # This field will have to be renamed later.
+ disk0:
id: disk0
interface: SAS
- by_path: "/dev/disk/by-path/dummy" # this path will have to change later.
+ by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:0:0"
+ disk1:
+ id: disk1
+ interface: SSD
+ by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:1:0"
software:
standard-environment: debian11-x64-std
management_tools:
diff --git a/input/grid5000/sites/sophia/clusters/mercantour5/nodes.yaml.erb b/input/grid5000/sites/sophia/clusters/mercantour5/nodes.yaml.erb
index b7c9a0c5b70..eb1a6179578 100644
--- a/input/grid5000/sites/sophia/clusters/mercantour5/nodes.yaml.erb
+++ b/input/grid5000/sites/sophia/clusters/mercantour5/nodes.yaml.erb
@@ -83,4 +83,8 @@ nodes:
storage: SSD # Fake data, will be replaced by g5k-checks
model: unknown # Fake data, will be replaced by g5k-checks
size: 8 # Fake data, will be replaced by g5k-checks
+ disk1:
+ storage: SSD # Fake data, will be replaced by g5k-checks
+ model: unknown # Fake data, will be replaced by g5k-checks
+ size: 8 # Fake data, will be replaced by g5k-checks
<% } %>
--
GitLab
From 3b0a3c515ba6a63c6d4b2e17061afa7a3152e8e3 Mon Sep 17 00:00:00 2001
From: Nathan Paulin <nathan.paulin@inria.fr>
Date: Tue, 4 Mar 2025 09:38:04 +0100
Subject: [PATCH 4/6] [sophia][mercantour5] add net_names_mapping conf
---
lib/refrepo/net_names_mapping.yaml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml
index dd35c9ed3f3..48a124e6a47 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -227,6 +227,9 @@ kinovis:
mercantour2:
enp1s0f0np0: eth0
eno2: eth1
+mercantour5:
+ enp1s0f0np0: eth0
+ ibp94s0: ib0
mercantour6:
enp1s0f0np0: eth0
eno1: eth0
--
GitLab
From 52c2d8216eab10b4c32d4138a7394dbd1cd450d9 Mon Sep 17 00:00:00 2001
From: Nathan Paulin <nathan.paulin@inria.fr>
Date: Tue, 4 Mar 2025 16:32:34 +0100
Subject: [PATCH 5/6] [sophia][mercantour5] add ib and generate json files
---
.../clusters/mercantour5/mercantour5.json | 2 +
.../mercantour5/nodes/mercantour5-1.json | 156 ++++++++++++++----
.../mercantour5/nodes/mercantour5-2.json | 156 ++++++++++++++----
.../mercantour5/nodes/mercantour5-3.json | 156 ++++++++++++++----
.../mercantour5/nodes/mercantour5-4.json | 156 ++++++++++++++----
input/grid5000/ipv4.yaml | 1 +
.../clusters/mercantour5/mercantour5.yaml | 6 +-
.../clusters/mercantour5/mercantour5_ib.yaml | 9 +
.../clusters/mercantour5/nodes.yaml.erb | 90 ----------
.../mercantour5/nodes/mercantour5-1.yaml | 123 ++++++++++++++
.../mercantour5/nodes/mercantour5-2.yaml | 123 ++++++++++++++
.../mercantour5/nodes/mercantour5-3.yaml | 123 ++++++++++++++
.../mercantour5/nodes/mercantour5-4.yaml | 123 ++++++++++++++
13 files changed, 986 insertions(+), 238 deletions(-)
create mode 100644 input/grid5000/sites/sophia/clusters/mercantour5/mercantour5_ib.yaml
delete mode 100644 input/grid5000/sites/sophia/clusters/mercantour5/nodes.yaml.erb
create mode 100644 input/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.yaml
create mode 100644 input/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.yaml
create mode 100644 input/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.yaml
create mode 100644 input/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.yaml
diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/mercantour5.json b/data/grid5000/sites/sophia/clusters/mercantour5/mercantour5.json
index bddb65c0308..a79050b46e8 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour5/mercantour5.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/mercantour5.json
@@ -52,6 +52,8 @@
}
],
"model": "Dell PowerEdge C6420",
+ "nodes_count": 4,
+ "nodes_description": "2 CPUs Intel Xeon Gold 6240, 18 cores/CPU, 384GB RAM, 558GB HDD, 893GB HDD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand",
"priority": 201907,
"queues": [
"admin",
diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.json b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.json
index 5e1be964c39..9384cc8f0e3 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.json
@@ -1,26 +1,27 @@
{
"architecture": {
- "cpu_core_numbering": "contiguous",
- "nb_cores": 72,
- "nb_procs": 1,
+ "cpu_core_numbering": "round-robin",
+ "nb_cores": 36,
+ "nb_procs": 2,
"nb_threads": 72,
"platform_type": "x86_64"
},
"bios": {
- "release_date": "01/01/2000",
- "vendor": "Unknown",
- "version": 1
+ "release_date": "09/19/2023",
+ "vendor": "Dell Inc.",
+ "version": "2.20.1"
},
- "bmc_version": "v1",
+ "bmc_version": "7.00.00.171",
"chassis": {
"manufactured_at": "2019-07-30",
- "manufacturer": "Unknown",
- "name": "Unknown",
+ "manufacturer": "Dell Inc.",
+ "name": "PowerEdge C6420",
+ "serial": "F8FVSY2",
"warranty_end": "2026-07-31"
},
"exotic": false,
"main_memory": {
- "ram_size": 8
+ "ram_size": 412316860416
},
"management_tools": {
"bmc_vendor_tool": "racadm",
@@ -30,29 +31,109 @@
},
"memory_devices": [
{
- "device": "dimm_proc 1 dimm 1",
- "size": 8,
+ "device": "dimm_a1",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a2",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a3",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a4",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a5",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a6",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b1",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b2",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b3",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b4",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b5",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b6",
+ "size": 34359738368,
"technology": "dram"
}
],
"network_adapters": [
{
"device": "eth0",
- "driver": "mlx_core",
+ "driver": "igb",
"enabled": true,
+ "firmware_version": "1.67, 0x800010e5, 22.5.7",
"interface": "Ethernet",
"ip": "172.16.130.42",
"ip6": "2001:660:4406:800:3::2a",
"kavlan": false,
"mac": "6c:2b:59:9c:4a:32",
"management": false,
+ "model": "I350 Gigabit Network Connection",
"mountable": true,
"mounted": true,
"name": "enp1s0f0np0",
"network_address": "mercantour5-1.sophia.grid5000.fr",
- "rate": 10000000000,
+ "rate": 1000000000,
+ "sriov": false,
+ "sriov_totalvfs": 0,
"switch": null,
- "switch_port": null
+ "switch_port": null,
+ "vendor": "Intel"
+ },
+ {
+ "device": "ib0",
+ "driver": "mlx4_core",
+ "enabled": true,
+ "firmware_version": "2.42.5000",
+ "guid": "0x98039b0300e903e1",
+ "interface": "InfiniBand",
+ "ip": "172.18.130.42",
+ "kavlan": false,
+ "mac": "98:03:9b:03:00:e9:03:e1",
+ "management": false,
+ "model": "MT27500 Family [ConnectX-3]",
+ "mountable": true,
+ "mounted": true,
+ "name": "ib0",
+ "netmask": "255.255.240.0",
+ "network_address": "mercantour5-1-ib0.sophia.grid5000.fr",
+ "rate": 40000000000,
+ "vendor": "Mellanox Technologies"
},
{
"device": "bmc",
@@ -69,28 +150,28 @@
],
"nodeset": "mercantour5",
"operating_system": {
- "cstate_driver": "unknown",
- "cstate_governor": "unknown",
+ "cstate_driver": "intel_idle",
+ "cstate_governor": "menu",
"ht_enabled": true,
- "pstate_driver": "unknwon",
- "pstate_governor": "unknown",
+ "pstate_driver": "intel_pstate",
+ "pstate_governor": "performance",
"turboboost_enabled": true
},
"performance": {
"core_flops": 83200000000,
- "node_flops": 5990400000000
+ "node_flops": 2995200000000
},
"processor": {
"cache_l1": null,
- "cache_l1d": 8,
- "cache_l1i": 8,
- "cache_l2": 8,
- "cache_l3": 8,
+ "cache_l1d": 32768,
+ "cache_l1i": 32768,
+ "cache_l2": 1048576,
+ "cache_l3": 25952256,
"clock_speed": 2600000000,
"ht_capable": true,
"instruction_set": "x86-64",
"microarchitecture": "Cascade Lake-SP",
- "microcode": "0xd000001",
+ "microcode": "0x5003707",
"model": "Intel Xeon",
"other_description": "Intel(R) Xeon(R) Gold 6240 CPU @ 2.60GHz",
"vendor": "Intel",
@@ -104,24 +185,26 @@
},
"storage_devices": [
{
- "by_id": "",
+ "by_id": "/dev/disk/by-id/wwn-0x64cd98f081535400b86f9a320761ff0b",
"by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:0:0",
+ "firmware_version": 4.3,
"id": "disk0",
"interface": "SAS",
- "model": "unknown",
- "size": 8,
- "storage": "SSD",
- "vendor": "Unknown"
+ "model": "PERC H330 Mini",
+ "size": 599550590976,
+ "storage": "HDD",
+ "vendor": "Dell"
},
{
- "by_id": "",
+ "by_id": "/dev/disk/by-id/wwn-0x64cd98f081535400b86f9b290daa83e8",
"by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:1:0",
+ "firmware_version": 4.3,
"id": "disk1",
"interface": "SSD",
- "model": "unknown",
- "size": 8,
- "storage": "SSD",
- "vendor": "Unknown"
+ "model": "PERC H330 Mini",
+ "size": 959119884288,
+ "storage": "HDD",
+ "vendor": "Dell"
}
],
"supported_job_types": {
@@ -131,7 +214,8 @@
"queues": [
"admin",
"testing"
- ]
+ ],
+ "virtual": "ivt"
},
"type": "node",
"uid": "mercantour5-1"
diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.json b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.json
index 731995a76c6..b648466782b 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.json
@@ -1,26 +1,27 @@
{
"architecture": {
- "cpu_core_numbering": "contiguous",
- "nb_cores": 72,
- "nb_procs": 1,
+ "cpu_core_numbering": "round-robin",
+ "nb_cores": 36,
+ "nb_procs": 2,
"nb_threads": 72,
"platform_type": "x86_64"
},
"bios": {
- "release_date": "01/01/2000",
- "vendor": "Unknown",
- "version": 1
+ "release_date": "09/19/2023",
+ "vendor": "Dell Inc.",
+ "version": "2.20.1"
},
- "bmc_version": "v1",
+ "bmc_version": "7.00.00.171",
"chassis": {
"manufactured_at": "2019-07-30",
- "manufacturer": "Unknown",
- "name": "Unknown",
+ "manufacturer": "Dell Inc.",
+ "name": "PowerEdge C6420",
+ "serial": "D8FVSY2",
"warranty_end": "2026-07-31"
},
"exotic": false,
"main_memory": {
- "ram_size": 8
+ "ram_size": 412316860416
},
"management_tools": {
"bmc_vendor_tool": "racadm",
@@ -30,29 +31,109 @@
},
"memory_devices": [
{
- "device": "dimm_proc 1 dimm 1",
- "size": 8,
+ "device": "dimm_a1",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a2",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a3",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a4",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a5",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a6",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b1",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b2",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b3",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b4",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b5",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b6",
+ "size": 34359738368,
"technology": "dram"
}
],
"network_adapters": [
{
"device": "eth0",
- "driver": "mlx_core",
+ "driver": "igb",
"enabled": true,
+ "firmware_version": "1.67, 0x800010e5, 22.5.7",
"interface": "Ethernet",
"ip": "172.16.130.43",
"ip6": "2001:660:4406:800:3::2b",
"kavlan": false,
"mac": "6c:2b:59:9c:3f:3a",
"management": false,
+ "model": "I350 Gigabit Network Connection",
"mountable": true,
"mounted": true,
"name": "enp1s0f0np0",
"network_address": "mercantour5-2.sophia.grid5000.fr",
- "rate": 10000000000,
+ "rate": 1000000000,
+ "sriov": false,
+ "sriov_totalvfs": 0,
"switch": null,
- "switch_port": null
+ "switch_port": null,
+ "vendor": "Intel"
+ },
+ {
+ "device": "ib0",
+ "driver": "mlx4_core",
+ "enabled": true,
+ "firmware_version": "2.42.5000",
+ "guid": "0xb8599f0300863081",
+ "interface": "InfiniBand",
+ "ip": "172.18.130.43",
+ "kavlan": false,
+ "mac": "b8:59:9f:03:00:86:30:81",
+ "management": false,
+ "model": "MT27500 Family [ConnectX-3]",
+ "mountable": true,
+ "mounted": true,
+ "name": "ib0",
+ "netmask": "255.255.240.0",
+ "network_address": "mercantour5-2-ib0.sophia.grid5000.fr",
+ "rate": 40000000000,
+ "vendor": "Mellanox Technologies"
},
{
"device": "bmc",
@@ -69,28 +150,28 @@
],
"nodeset": "mercantour5",
"operating_system": {
- "cstate_driver": "unknown",
- "cstate_governor": "unknown",
+ "cstate_driver": "intel_idle",
+ "cstate_governor": "menu",
"ht_enabled": true,
- "pstate_driver": "unknwon",
- "pstate_governor": "unknown",
+ "pstate_driver": "intel_pstate",
+ "pstate_governor": "performance",
"turboboost_enabled": true
},
"performance": {
"core_flops": 83200000000,
- "node_flops": 5990400000000
+ "node_flops": 2995200000000
},
"processor": {
"cache_l1": null,
- "cache_l1d": 8,
- "cache_l1i": 8,
- "cache_l2": 8,
- "cache_l3": 8,
+ "cache_l1d": 32768,
+ "cache_l1i": 32768,
+ "cache_l2": 1048576,
+ "cache_l3": 25952256,
"clock_speed": 2600000000,
"ht_capable": true,
"instruction_set": "x86-64",
"microarchitecture": "Cascade Lake-SP",
- "microcode": "0xd000001",
+ "microcode": "0x5003707",
"model": "Intel Xeon",
"other_description": "Intel(R) Xeon(R) Gold 6240 CPU @ 2.60GHz",
"vendor": "Intel",
@@ -104,24 +185,26 @@
},
"storage_devices": [
{
- "by_id": "",
+ "by_id": "/dev/disk/by-id/wwn-0x64cd98f0815397002f58570040731379",
"by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:0:0",
+ "firmware_version": 4.3,
"id": "disk0",
"interface": "SAS",
- "model": "unknown",
- "size": 8,
- "storage": "SSD",
- "vendor": "Unknown"
+ "model": "PERC H330 Mini",
+ "size": 599550590976,
+ "storage": "HDD",
+ "vendor": "Dell"
},
{
- "by_id": "",
+ "by_id": "/dev/disk/by-id/wwn-0x64cd98f0815397002f5857a14a070b34",
"by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:1:0",
+ "firmware_version": 4.3,
"id": "disk1",
"interface": "SSD",
- "model": "unknown",
- "size": 8,
- "storage": "SSD",
- "vendor": "Unknown"
+ "model": "PERC H330 Mini",
+ "size": 959119884288,
+ "storage": "HDD",
+ "vendor": "Dell"
}
],
"supported_job_types": {
@@ -131,7 +214,8 @@
"queues": [
"admin",
"testing"
- ]
+ ],
+ "virtual": "ivt"
},
"type": "node",
"uid": "mercantour5-2"
diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.json b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.json
index eb7aea67984..d422da1116b 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.json
@@ -1,26 +1,27 @@
{
"architecture": {
- "cpu_core_numbering": "contiguous",
- "nb_cores": 72,
- "nb_procs": 1,
+ "cpu_core_numbering": "round-robin",
+ "nb_cores": 36,
+ "nb_procs": 2,
"nb_threads": 72,
"platform_type": "x86_64"
},
"bios": {
- "release_date": "01/01/2000",
- "vendor": "Unknown",
- "version": 1
+ "release_date": "09/19/2023",
+ "vendor": "Dell Inc.",
+ "version": "2.20.1"
},
- "bmc_version": "v1",
+ "bmc_version": "7.00.00.171",
"chassis": {
"manufactured_at": "2019-07-30",
- "manufacturer": "Unknown",
- "name": "Unknown",
+ "manufacturer": "Dell Inc.",
+ "name": "PowerEdge C6420",
+ "serial": "G8FVSY2",
"warranty_end": "2026-07-31"
},
"exotic": false,
"main_memory": {
- "ram_size": 8
+ "ram_size": 412316860416
},
"management_tools": {
"bmc_vendor_tool": "racadm",
@@ -30,29 +31,109 @@
},
"memory_devices": [
{
- "device": "dimm_proc 1 dimm 1",
- "size": 8,
+ "device": "dimm_a1",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a2",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a3",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a4",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a5",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a6",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b1",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b2",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b3",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b4",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b5",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b6",
+ "size": 34359738368,
"technology": "dram"
}
],
"network_adapters": [
{
"device": "eth0",
- "driver": "mlx_core",
+ "driver": "igb",
"enabled": true,
+ "firmware_version": "1.67, 0x800010e5, 22.5.7",
"interface": "Ethernet",
"ip": "172.16.130.44",
"ip6": "2001:660:4406:800:3::2c",
"kavlan": false,
"mac": "6c:2b:59:9c:4a:6d",
"management": false,
+ "model": "I350 Gigabit Network Connection",
"mountable": true,
"mounted": true,
"name": "enp1s0f0np0",
"network_address": "mercantour5-3.sophia.grid5000.fr",
- "rate": 10000000000,
+ "rate": 1000000000,
+ "sriov": false,
+ "sriov_totalvfs": 0,
"switch": null,
- "switch_port": null
+ "switch_port": null,
+ "vendor": "Intel"
+ },
+ {
+ "device": "ib0",
+ "driver": "mlx4_core",
+ "enabled": true,
+ "firmware_version": "2.42.5000",
+ "guid": "0x98039b0300e90431",
+ "interface": "InfiniBand",
+ "ip": "172.18.130.44",
+ "kavlan": false,
+ "mac": "98:03:9b:03:00:e9:04:31",
+ "management": false,
+ "model": "MT27500 Family [ConnectX-3]",
+ "mountable": true,
+ "mounted": true,
+ "name": "ib0",
+ "netmask": "255.255.240.0",
+ "network_address": "mercantour5-3-ib0.sophia.grid5000.fr",
+ "rate": 40000000000,
+ "vendor": "Mellanox Technologies"
},
{
"device": "bmc",
@@ -69,28 +150,28 @@
],
"nodeset": "mercantour5",
"operating_system": {
- "cstate_driver": "unknown",
- "cstate_governor": "unknown",
+ "cstate_driver": "intel_idle",
+ "cstate_governor": "menu",
"ht_enabled": true,
- "pstate_driver": "unknwon",
- "pstate_governor": "unknown",
+ "pstate_driver": "intel_pstate",
+ "pstate_governor": "performance",
"turboboost_enabled": true
},
"performance": {
"core_flops": 83200000000,
- "node_flops": 5990400000000
+ "node_flops": 2995200000000
},
"processor": {
"cache_l1": null,
- "cache_l1d": 8,
- "cache_l1i": 8,
- "cache_l2": 8,
- "cache_l3": 8,
+ "cache_l1d": 32768,
+ "cache_l1i": 32768,
+ "cache_l2": 1048576,
+ "cache_l3": 25952256,
"clock_speed": 2600000000,
"ht_capable": true,
"instruction_set": "x86-64",
"microarchitecture": "Cascade Lake-SP",
- "microcode": "0xd000001",
+ "microcode": "0x5003707",
"model": "Intel Xeon",
"other_description": "Intel(R) Xeon(R) Gold 6240 CPU @ 2.60GHz",
"vendor": "Intel",
@@ -104,24 +185,26 @@
},
"storage_devices": [
{
- "by_id": "",
+ "by_id": "/dev/disk/by-id/wwn-0x64cd98f081535b00b86f9a470547b034",
"by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:0:0",
+ "firmware_version": 4.3,
"id": "disk0",
"interface": "SAS",
- "model": "unknown",
- "size": 8,
- "storage": "SSD",
- "vendor": "Unknown"
+ "model": "PERC H330 Mini",
+ "size": 599550590976,
+ "storage": "HDD",
+ "vendor": "Dell"
},
{
- "by_id": "",
+ "by_id": "/dev/disk/by-id/wwn-0x64cd98f081535b00b86f9b6f1068ff7a",
"by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:1:0",
+ "firmware_version": 4.3,
"id": "disk1",
"interface": "SSD",
- "model": "unknown",
- "size": 8,
- "storage": "SSD",
- "vendor": "Unknown"
+ "model": "PERC H330 Mini",
+ "size": 959119884288,
+ "storage": "HDD",
+ "vendor": "Dell"
}
],
"supported_job_types": {
@@ -131,7 +214,8 @@
"queues": [
"admin",
"testing"
- ]
+ ],
+ "virtual": "ivt"
},
"type": "node",
"uid": "mercantour5-3"
diff --git a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.json b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.json
index 9480be26030..38d1ba9b710 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.json
@@ -1,26 +1,27 @@
{
"architecture": {
- "cpu_core_numbering": "contiguous",
- "nb_cores": 72,
- "nb_procs": 1,
+ "cpu_core_numbering": "round-robin",
+ "nb_cores": 36,
+ "nb_procs": 2,
"nb_threads": 72,
"platform_type": "x86_64"
},
"bios": {
- "release_date": "01/01/2000",
- "vendor": "Unknown",
- "version": 1
+ "release_date": "09/19/2023",
+ "vendor": "Dell Inc.",
+ "version": "2.20.1"
},
- "bmc_version": "v1",
+ "bmc_version": "7.00.00.171",
"chassis": {
"manufactured_at": "2019-07-30",
- "manufacturer": "Unknown",
- "name": "Unknown",
+ "manufacturer": "Dell Inc.",
+ "name": "PowerEdge C6420",
+ "serial": "H8FVSY2",
"warranty_end": "2026-07-31"
},
"exotic": false,
"main_memory": {
- "ram_size": 8
+ "ram_size": 412316860416
},
"management_tools": {
"bmc_vendor_tool": "racadm",
@@ -30,29 +31,109 @@
},
"memory_devices": [
{
- "device": "dimm_proc 1 dimm 1",
- "size": 8,
+ "device": "dimm_a1",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a2",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a3",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a4",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a5",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_a6",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b1",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b2",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b3",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b4",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b5",
+ "size": 34359738368,
+ "technology": "dram"
+ },
+ {
+ "device": "dimm_b6",
+ "size": 34359738368,
"technology": "dram"
}
],
"network_adapters": [
{
"device": "eth0",
- "driver": "mlx_core",
+ "driver": "igb",
"enabled": true,
+ "firmware_version": "1.67, 0x800010e5, 22.5.7",
"interface": "Ethernet",
"ip": "172.16.130.45",
"ip6": "2001:660:4406:800:3::2d",
"kavlan": false,
"mac": "6c:2b:59:9a:05:c4",
"management": false,
+ "model": "I350 Gigabit Network Connection",
"mountable": true,
"mounted": true,
"name": "enp1s0f0np0",
"network_address": "mercantour5-4.sophia.grid5000.fr",
- "rate": 10000000000,
+ "rate": 1000000000,
+ "sriov": false,
+ "sriov_totalvfs": 0,
"switch": null,
- "switch_port": null
+ "switch_port": null,
+ "vendor": "Intel"
+ },
+ {
+ "device": "ib0",
+ "driver": "mlx4_core",
+ "enabled": true,
+ "firmware_version": "2.42.5000",
+ "guid": "0x98039b0300e90111",
+ "interface": "InfiniBand",
+ "ip": "172.18.130.45",
+ "kavlan": false,
+ "mac": "98:03:9b:03:00:e9:01:11",
+ "management": false,
+ "model": "MT27500 Family [ConnectX-3]",
+ "mountable": true,
+ "mounted": true,
+ "name": "ib0",
+ "netmask": "255.255.240.0",
+ "network_address": "mercantour5-4-ib0.sophia.grid5000.fr",
+ "rate": 40000000000,
+ "vendor": "Mellanox Technologies"
},
{
"device": "bmc",
@@ -69,28 +150,28 @@
],
"nodeset": "mercantour5",
"operating_system": {
- "cstate_driver": "unknown",
- "cstate_governor": "unknown",
+ "cstate_driver": "intel_idle",
+ "cstate_governor": "menu",
"ht_enabled": true,
- "pstate_driver": "unknwon",
- "pstate_governor": "unknown",
+ "pstate_driver": "intel_pstate",
+ "pstate_governor": "performance",
"turboboost_enabled": true
},
"performance": {
"core_flops": 83200000000,
- "node_flops": 5990400000000
+ "node_flops": 2995200000000
},
"processor": {
"cache_l1": null,
- "cache_l1d": 8,
- "cache_l1i": 8,
- "cache_l2": 8,
- "cache_l3": 8,
+ "cache_l1d": 32768,
+ "cache_l1i": 32768,
+ "cache_l2": 1048576,
+ "cache_l3": 25952256,
"clock_speed": 2600000000,
"ht_capable": true,
"instruction_set": "x86-64",
"microarchitecture": "Cascade Lake-SP",
- "microcode": "0xd000001",
+ "microcode": "0x5003707",
"model": "Intel Xeon",
"other_description": "Intel(R) Xeon(R) Gold 6240 CPU @ 2.60GHz",
"vendor": "Intel",
@@ -104,24 +185,26 @@
},
"storage_devices": [
{
- "by_id": "",
+ "by_id": "/dev/disk/by-id/wwn-0x64cd98f081534c002f58582d04fe677b",
"by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:0:0",
+ "firmware_version": 4.3,
"id": "disk0",
"interface": "SAS",
- "model": "unknown",
- "size": 8,
- "storage": "SSD",
- "vendor": "Unknown"
+ "model": "PERC H330 Mini",
+ "size": 599550590976,
+ "storage": "HDD",
+ "vendor": "Dell"
},
{
- "by_id": "",
+ "by_id": "/dev/disk/by-id/wwn-0x64cd98f081534c002f58597f12fc7111",
"by_path": "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:1:0",
+ "firmware_version": 4.3,
"id": "disk1",
"interface": "SSD",
- "model": "unknown",
- "size": 8,
- "storage": "SSD",
- "vendor": "Unknown"
+ "model": "PERC H330 Mini",
+ "size": 959119884288,
+ "storage": "HDD",
+ "vendor": "Dell"
}
],
"supported_job_types": {
@@ -131,7 +214,8 @@
"queues": [
"admin",
"testing"
- ]
+ ],
+ "virtual": "ivt"
},
"type": "node",
"uid": "mercantour5-4"
diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml
index 5530e276559..eb5a9944d43 100644
--- a/input/grid5000/ipv4.yaml
+++ b/input/grid5000/ipv4.yaml
@@ -121,6 +121,7 @@ ipv4:
sophia mercantour3 eth0 0 0 2 24
sophia mercantour4 eth0 0 0 2 40
sophia mercantour5 eth0 0 0 2 41
+ sophia mercantour5 ib0 0 0 2 41
sophia mercantour6 eth0 0 0 2 45
sophia mercantour6 ib0 0 0 2 45
sophia mercantour7 eth0 0 0 2 46
diff --git a/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml b/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml
index 243fbba8a3f..582547d48f7 100644
--- a/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml
+++ b/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml
@@ -30,14 +30,12 @@ nodes:
mountable: true
mounted: true
storage_devices:
- disk0:
+ pci-0000:3b:00.0-scsi-0:2:0:0:
id: disk0
interface: SAS
- by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:0:0"
- disk1:
+ pci-0000:3b:00.0-scsi-0:2:1:0:
id: disk1
interface: SSD
- by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:1:0"
software:
standard-environment: debian11-x64-std
management_tools:
diff --git a/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5_ib.yaml b/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5_ib.yaml
new file mode 100644
index 00000000000..5ff64ee31bf
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5_ib.yaml
@@ -0,0 +1,9 @@
+---
+nodes:
+ mercantour5-[1-4]:
+ network_adapters:
+ ib0:
+ enabled: true
+ mountable: true
+ mounted: true
+ netmask: 255.255.240.0
\ No newline at end of file
diff --git a/input/grid5000/sites/sophia/clusters/mercantour5/nodes.yaml.erb b/input/grid5000/sites/sophia/clusters/mercantour5/nodes.yaml.erb
deleted file mode 100644
index eb1a6179578..00000000000
--- a/input/grid5000/sites/sophia/clusters/mercantour5/nodes.yaml.erb
+++ /dev/null
@@ -1,90 +0,0 @@
-<%
- # File generated by 'rake mass:create SRC=doc/sophia-clusters-mass-create-tmp.csv
- # If changes are needed, it might be better to edit the source data and regenerate using 'rake mass:create'
-
- cluster_name = "mercantour5"
- nodes_number = 4 # Size of the cluster (number of nodes)
- # MAC addresses declaration
- mac_eth0_list = %w(
-6c:2b:59:9c:4a:32
-6c:2b:59:9c:3f:3a
-6c:2b:59:9c:4a:6d
-6c:2b:59:9a:05:c4
- )
- mac_bmc_list = %w(
-6c:2b:59:9c:48:65
-6c:2b:59:9c:3c:51
-6c:2b:59:9c:46:df
-6c:2b:59:99:fd:38
- )
-%>
----
-nodes:
-<% (1..nodes_number).each { |i| %>
- <%= cluster_name %>-<%= i %>:
- architecture:
- nb_procs: 1 # Fake data, will be replaced by g5k-checks
- nb_cores: 72 # Fake data, will be replaced by g5k-checks
- nb_threads: 72 # Fake data, will be replaced by g5k-checks
- platform_type: x86_64 # Fake data, will be replaced by g5k-checks
- cpu_core_numbering: contiguous # Fake data, will be replaced by g5k-checks
- bios:
- release_date: 01/01/2000 # Fake date, will be replaced by g5k-checks
- vendor: Unknown # Fake vendor, will be replaced by g5k-checks
- version: 1 # Fake version, will be replaced by g5k-checks
- bmc_version: v1 # Fake version, will be replaced by g5k-checks
- chassis:
- manufacturer: Unknown # Fake manufacturer, will be replaced by g5k-checks
- name: Unknown # Fake name, will be replaced by g5k-checks
- main_memory:
- ram_size: 8 # Fake size, will be replaced by g5k-checks
- memory_devices:
- dimm:
- size: 8 # Fake size, will be replaced by g5k-checks
- technology: dram # Common memory technology, will be replaced by g5k-checks
- processor:
- model: Intel Xeon # Fake model name, will be replaced by g5k-checks
- other_description: Intel(R) Xeon(R) Gold 6240 CPU @ 2.60GHz # Fake description, will be replaced by g5k-checks
- vendor: Intel # Fake vendor, will be replaced by g5k-checks
- version: Gold 6240 # Fake version, will be replaced by g5k-checks
- cache_l1d: 8 # Fake cache, will be replaced by g5k-checks
- cache_l1i: 8 # Fake cache, will be replaced by g5k-checks
- cache_l2: 8 # Fake cache, will be replaced by g5k-checks
- cache_l3: 8 # Fake cache, will be replaced by g5k-checks
- instruction_set: x86-64 # Common instruction set, will be replaced by g5k-checks
- microcode: "0xd000001" # Fake microcode, will be replaced by g5k-checks
- ht_capable: true # Default ht capable value, will be replaced by g5k-checks
- main_memory:
- ram_size: 8 # Fake ram size, will be replaced by g5k-checks
- memory_devices:
- dimm_proc 1 dimm 1: # Fake dimm name, will be replaced by g5k-checks
- size: 8 # Fake dimm size, will be replaced by g5k-checks
- technology: dram # Default dimm technology, will be replaced by g5k-checks
- operating_system:
- cstate_driver: unknown # Fake driver, will be replaced by g5k-checks
- cstate_governor: unknown # Fake governor, will be replaced by g5k-checks
- ht_enabled: true # common value for hyper threading, will be replaced by g5k-checks
- pstate_driver: unknwon # Fake driver, will be replaced by g5k-checks
- pstate_governor: unknown # Fake driver, will be replaced by g5k-checks
- turboboost_enabled: true # Default value for turboboost, will be replaced by g5k-checks
- network_adapters:
- bmc:
- management: true
- mac: <%= mac_bmc_list[i - 1] %>
- eth0:
- interface: Ethernet
- management: false
- driver: mlx_core # Fake data, will be replaced by g5k-checks
- name: enp1s0f0np0 # Fake data, will be replaced by g5k-checks
- rate: 10000000000 # Fake data, will be replaced by g5k-checks
- mac: <%= mac_eth0_list[i - 1] %>
- storage_devices:
- disk0:
- storage: SSD # Fake data, will be replaced by g5k-checks
- model: unknown # Fake data, will be replaced by g5k-checks
- size: 8 # Fake data, will be replaced by g5k-checks
- disk1:
- storage: SSD # Fake data, will be replaced by g5k-checks
- model: unknown # Fake data, will be replaced by g5k-checks
- size: 8 # Fake data, will be replaced by g5k-checks
-<% } %>
diff --git a/input/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.yaml b/input/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.yaml
new file mode 100644
index 00000000000..bcc59d2e7aa
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-1.yaml
@@ -0,0 +1,123 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+mercantour5-1:
+ architecture:
+ cpu_core_numbering: round-robin
+ nb_cores: 36
+ nb_procs: 2
+ nb_threads: 72
+ platform_type: x86_64
+ bios:
+ release_date: '09/19/2023'
+ vendor: Dell Inc.
+ version: 2.20.1
+ bmc_version: 7.00.00.171
+ chassis:
+ manufacturer: Dell Inc.
+ name: PowerEdge C6420
+ serial: F8FVSY2
+ main_memory:
+ ram_size: 412316860416
+ memory_devices:
+ dimm_a1:
+ size: 34359738368
+ technology: dram
+ dimm_a2:
+ size: 34359738368
+ technology: dram
+ dimm_a3:
+ size: 34359738368
+ technology: dram
+ dimm_a4:
+ size: 34359738368
+ technology: dram
+ dimm_a5:
+ size: 34359738368
+ technology: dram
+ dimm_a6:
+ size: 34359738368
+ technology: dram
+ dimm_b1:
+ size: 34359738368
+ technology: dram
+ dimm_b2:
+ size: 34359738368
+ technology: dram
+ dimm_b3:
+ size: 34359738368
+ technology: dram
+ dimm_b4:
+ size: 34359738368
+ technology: dram
+ dimm_b5:
+ size: 34359738368
+ technology: dram
+ dimm_b6:
+ size: 34359738368
+ technology: dram
+ network_adapters:
+ bmc:
+ ip: 172.17.130.42
+ mac: 6c:2b:59:9c:48:65
+ management: true
+ eth0:
+ driver: igb
+ firmware_version: 1.67, 0x800010e5, 22.5.7
+ interface: Ethernet
+ ip: 172.16.130.42
+ mac: 6c:2b:59:9c:4a:32
+ management: false
+ model: I350 Gigabit Network Connection
+ name: enp1s0f0np0
+ rate: 1000000000
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Intel
+ ib0:
+ driver: mlx4_core
+ firmware_version: 2.42.5000
+ guid: '0x98039b0300e903e1'
+ interface: InfiniBand
+ ip: 172.18.130.42
+ mac: 98:03:9b:03:00:e9:03:e1
+ management: false
+ model: MT27500 Family [ConnectX-3]
+ name: ib0
+ rate: 40000000000
+ vendor: Mellanox Technologies
+ operating_system:
+ cstate_driver: intel_idle
+ cstate_governor: menu
+ ht_enabled: true
+ pstate_driver: intel_pstate
+ pstate_governor: performance
+ turboboost_enabled: true
+ processor:
+ cache_l1d: 32768
+ cache_l1i: 32768
+ cache_l2: 1048576
+ cache_l3: 25952256
+ ht_capable: true
+ instruction_set: x86-64
+ microcode: '0x5003707'
+ model: Intel Xeon
+ other_description: Intel(R) Xeon(R) Gold 6240 CPU @ 2.60GHz
+ vendor: Intel
+ version: Gold 6240
+ storage_devices:
+ pci-0000:3b:00.0-scsi-0:2:0:0:
+ by_id: "/dev/disk/by-id/wwn-0x64cd98f081535400b86f9a320761ff0b"
+ by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:0:0"
+ firmware_version: 4.3
+ model: PERC H330 Mini
+ size: 599550590976
+ storage: HDD
+ pci-0000:3b:00.0-scsi-0:2:1:0:
+ by_id: "/dev/disk/by-id/wwn-0x64cd98f081535400b86f9b290daa83e8"
+ by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:1:0"
+ firmware_version: 4.3
+ model: PERC H330 Mini
+ size: 959119884288
+ storage: HDD
+ supported_job_types:
+ virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.yaml b/input/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.yaml
new file mode 100644
index 00000000000..2715e1692f0
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-2.yaml
@@ -0,0 +1,123 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+mercantour5-2:
+ architecture:
+ cpu_core_numbering: round-robin
+ nb_cores: 36
+ nb_procs: 2
+ nb_threads: 72
+ platform_type: x86_64
+ bios:
+ release_date: '09/19/2023'
+ vendor: Dell Inc.
+ version: 2.20.1
+ bmc_version: 7.00.00.171
+ chassis:
+ manufacturer: Dell Inc.
+ name: PowerEdge C6420
+ serial: D8FVSY2
+ main_memory:
+ ram_size: 412316860416
+ memory_devices:
+ dimm_a1:
+ size: 34359738368
+ technology: dram
+ dimm_a2:
+ size: 34359738368
+ technology: dram
+ dimm_a3:
+ size: 34359738368
+ technology: dram
+ dimm_a4:
+ size: 34359738368
+ technology: dram
+ dimm_a5:
+ size: 34359738368
+ technology: dram
+ dimm_a6:
+ size: 34359738368
+ technology: dram
+ dimm_b1:
+ size: 34359738368
+ technology: dram
+ dimm_b2:
+ size: 34359738368
+ technology: dram
+ dimm_b3:
+ size: 34359738368
+ technology: dram
+ dimm_b4:
+ size: 34359738368
+ technology: dram
+ dimm_b5:
+ size: 34359738368
+ technology: dram
+ dimm_b6:
+ size: 34359738368
+ technology: dram
+ network_adapters:
+ bmc:
+ ip: 172.17.130.43
+ mac: 6c:2b:59:9c:3c:51
+ management: true
+ eth0:
+ driver: igb
+ firmware_version: 1.67, 0x800010e5, 22.5.7
+ interface: Ethernet
+ ip: 172.16.130.43
+ mac: 6c:2b:59:9c:3f:3a
+ management: false
+ model: I350 Gigabit Network Connection
+ name: enp1s0f0np0
+ rate: 1000000000
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Intel
+ ib0:
+ driver: mlx4_core
+ firmware_version: 2.42.5000
+ guid: '0xb8599f0300863081'
+ interface: InfiniBand
+ ip: 172.18.130.43
+ mac: b8:59:9f:03:00:86:30:81
+ management: false
+ model: MT27500 Family [ConnectX-3]
+ name: ib0
+ rate: 40000000000
+ vendor: Mellanox Technologies
+ operating_system:
+ cstate_driver: intel_idle
+ cstate_governor: menu
+ ht_enabled: true
+ pstate_driver: intel_pstate
+ pstate_governor: performance
+ turboboost_enabled: true
+ processor:
+ cache_l1d: 32768
+ cache_l1i: 32768
+ cache_l2: 1048576
+ cache_l3: 25952256
+ ht_capable: true
+ instruction_set: x86-64
+ microcode: '0x5003707'
+ model: Intel Xeon
+ other_description: Intel(R) Xeon(R) Gold 6240 CPU @ 2.60GHz
+ vendor: Intel
+ version: Gold 6240
+ storage_devices:
+ pci-0000:3b:00.0-scsi-0:2:0:0:
+ by_id: "/dev/disk/by-id/wwn-0x64cd98f0815397002f58570040731379"
+ by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:0:0"
+ firmware_version: 4.3
+ model: PERC H330 Mini
+ size: 599550590976
+ storage: HDD
+ pci-0000:3b:00.0-scsi-0:2:1:0:
+ by_id: "/dev/disk/by-id/wwn-0x64cd98f0815397002f5857a14a070b34"
+ by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:1:0"
+ firmware_version: 4.3
+ model: PERC H330 Mini
+ size: 959119884288
+ storage: HDD
+ supported_job_types:
+ virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.yaml b/input/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.yaml
new file mode 100644
index 00000000000..c7145a76261
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-3.yaml
@@ -0,0 +1,123 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+mercantour5-3:
+ architecture:
+ cpu_core_numbering: round-robin
+ nb_cores: 36
+ nb_procs: 2
+ nb_threads: 72
+ platform_type: x86_64
+ bios:
+ release_date: '09/19/2023'
+ vendor: Dell Inc.
+ version: 2.20.1
+ bmc_version: 7.00.00.171
+ chassis:
+ manufacturer: Dell Inc.
+ name: PowerEdge C6420
+ serial: G8FVSY2
+ main_memory:
+ ram_size: 412316860416
+ memory_devices:
+ dimm_a1:
+ size: 34359738368
+ technology: dram
+ dimm_a2:
+ size: 34359738368
+ technology: dram
+ dimm_a3:
+ size: 34359738368
+ technology: dram
+ dimm_a4:
+ size: 34359738368
+ technology: dram
+ dimm_a5:
+ size: 34359738368
+ technology: dram
+ dimm_a6:
+ size: 34359738368
+ technology: dram
+ dimm_b1:
+ size: 34359738368
+ technology: dram
+ dimm_b2:
+ size: 34359738368
+ technology: dram
+ dimm_b3:
+ size: 34359738368
+ technology: dram
+ dimm_b4:
+ size: 34359738368
+ technology: dram
+ dimm_b5:
+ size: 34359738368
+ technology: dram
+ dimm_b6:
+ size: 34359738368
+ technology: dram
+ network_adapters:
+ bmc:
+ ip: 172.17.130.44
+ mac: 6c:2b:59:9c:46:df
+ management: true
+ eth0:
+ driver: igb
+ firmware_version: 1.67, 0x800010e5, 22.5.7
+ interface: Ethernet
+ ip: 172.16.130.44
+ mac: 6c:2b:59:9c:4a:6d
+ management: false
+ model: I350 Gigabit Network Connection
+ name: enp1s0f0np0
+ rate: 1000000000
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Intel
+ ib0:
+ driver: mlx4_core
+ firmware_version: 2.42.5000
+ guid: '0x98039b0300e90431'
+ interface: InfiniBand
+ ip: 172.18.130.44
+ mac: 98:03:9b:03:00:e9:04:31
+ management: false
+ model: MT27500 Family [ConnectX-3]
+ name: ib0
+ rate: 40000000000
+ vendor: Mellanox Technologies
+ operating_system:
+ cstate_driver: intel_idle
+ cstate_governor: menu
+ ht_enabled: true
+ pstate_driver: intel_pstate
+ pstate_governor: performance
+ turboboost_enabled: true
+ processor:
+ cache_l1d: 32768
+ cache_l1i: 32768
+ cache_l2: 1048576
+ cache_l3: 25952256
+ ht_capable: true
+ instruction_set: x86-64
+ microcode: '0x5003707'
+ model: Intel Xeon
+ other_description: Intel(R) Xeon(R) Gold 6240 CPU @ 2.60GHz
+ vendor: Intel
+ version: Gold 6240
+ storage_devices:
+ pci-0000:3b:00.0-scsi-0:2:0:0:
+ by_id: "/dev/disk/by-id/wwn-0x64cd98f081535b00b86f9a470547b034"
+ by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:0:0"
+ firmware_version: 4.3
+ model: PERC H330 Mini
+ size: 599550590976
+ storage: HDD
+ pci-0000:3b:00.0-scsi-0:2:1:0:
+ by_id: "/dev/disk/by-id/wwn-0x64cd98f081535b00b86f9b6f1068ff7a"
+ by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:1:0"
+ firmware_version: 4.3
+ model: PERC H330 Mini
+ size: 959119884288
+ storage: HDD
+ supported_job_types:
+ virtual: ivt
diff --git a/input/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.yaml b/input/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.yaml
new file mode 100644
index 00000000000..75917bef0b3
--- /dev/null
+++ b/input/grid5000/sites/sophia/clusters/mercantour5/nodes/mercantour5-4.yaml
@@ -0,0 +1,123 @@
+# Generated by g5k-checks (g5k-checks -m api)
+---
+mercantour5-4:
+ architecture:
+ cpu_core_numbering: round-robin
+ nb_cores: 36
+ nb_procs: 2
+ nb_threads: 72
+ platform_type: x86_64
+ bios:
+ release_date: '09/19/2023'
+ vendor: Dell Inc.
+ version: 2.20.1
+ bmc_version: 7.00.00.171
+ chassis:
+ manufacturer: Dell Inc.
+ name: PowerEdge C6420
+ serial: H8FVSY2
+ main_memory:
+ ram_size: 412316860416
+ memory_devices:
+ dimm_a1:
+ size: 34359738368
+ technology: dram
+ dimm_a2:
+ size: 34359738368
+ technology: dram
+ dimm_a3:
+ size: 34359738368
+ technology: dram
+ dimm_a4:
+ size: 34359738368
+ technology: dram
+ dimm_a5:
+ size: 34359738368
+ technology: dram
+ dimm_a6:
+ size: 34359738368
+ technology: dram
+ dimm_b1:
+ size: 34359738368
+ technology: dram
+ dimm_b2:
+ size: 34359738368
+ technology: dram
+ dimm_b3:
+ size: 34359738368
+ technology: dram
+ dimm_b4:
+ size: 34359738368
+ technology: dram
+ dimm_b5:
+ size: 34359738368
+ technology: dram
+ dimm_b6:
+ size: 34359738368
+ technology: dram
+ network_adapters:
+ bmc:
+ ip: 172.17.130.45
+ mac: 6c:2b:59:99:fd:38
+ management: true
+ eth0:
+ driver: igb
+ firmware_version: 1.67, 0x800010e5, 22.5.7
+ interface: Ethernet
+ ip: 172.16.130.45
+ mac: 6c:2b:59:9a:05:c4
+ management: false
+ model: I350 Gigabit Network Connection
+ name: enp1s0f0np0
+ rate: 1000000000
+ sriov: false
+ sriov_totalvfs: 0
+ vendor: Intel
+ ib0:
+ driver: mlx4_core
+ firmware_version: 2.42.5000
+ guid: '0x98039b0300e90111'
+ interface: InfiniBand
+ ip: 172.18.130.45
+ mac: 98:03:9b:03:00:e9:01:11
+ management: false
+ model: MT27500 Family [ConnectX-3]
+ name: ib0
+ rate: 40000000000
+ vendor: Mellanox Technologies
+ operating_system:
+ cstate_driver: intel_idle
+ cstate_governor: menu
+ ht_enabled: true
+ pstate_driver: intel_pstate
+ pstate_governor: performance
+ turboboost_enabled: true
+ processor:
+ cache_l1d: 32768
+ cache_l1i: 32768
+ cache_l2: 1048576
+ cache_l3: 25952256
+ ht_capable: true
+ instruction_set: x86-64
+ microcode: '0x5003707'
+ model: Intel Xeon
+ other_description: Intel(R) Xeon(R) Gold 6240 CPU @ 2.60GHz
+ vendor: Intel
+ version: Gold 6240
+ storage_devices:
+ pci-0000:3b:00.0-scsi-0:2:0:0:
+ by_id: "/dev/disk/by-id/wwn-0x64cd98f081534c002f58582d04fe677b"
+ by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:0:0"
+ firmware_version: 4.3
+ model: PERC H330 Mini
+ size: 599550590976
+ storage: HDD
+ pci-0000:3b:00.0-scsi-0:2:1:0:
+ by_id: "/dev/disk/by-id/wwn-0x64cd98f081534c002f58597f12fc7111"
+ by_path: "/dev/disk/by-path/pci-0000:3b:00.0-scsi-0:2:1:0"
+ firmware_version: 4.3
+ model: PERC H330 Mini
+ size: 959119884288
+ storage: HDD
+ supported_job_types:
+ virtual: ivt
--
GitLab
From f4227a658cb7060a00f9e799a92d7bdadf98f88c Mon Sep 17 00:00:00 2001
From: Nathan Paulin <nathan.paulin@inria.fr>
Date: Thu, 6 Mar 2025 08:49:05 +0100
Subject: [PATCH 6/6] [sophia][mercantour5] add dell warranty
---
input/grid5000/dell-product-data.yaml | 18 ++++++++++++++++++
.../clusters/mercantour5/mercantour5.yaml | 3 ---
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/input/grid5000/dell-product-data.yaml b/input/grid5000/dell-product-data.yaml
index 0888f21bbe9..8ce522b90bc 100644
--- a/input/grid5000/dell-product-data.yaml
+++ b/input/grid5000/dell-product-data.yaml
@@ -2262,6 +2262,24 @@ sites:
chassis:
manufactured_at: 2015-09-02
warranty_end: 2020-09-02
+ mercantour5:
+ nodes:
+ mercantour5-1:
+ chassis:
+ manufactured_at: 2019-07-30
+ warranty_end: 2026-07-31
+ mercantour5-2:
+ chassis:
+ manufactured_at: 2019-07-30
+ warranty_end: 2026-07-31
+ mercantour5-3:
+ chassis:
+ manufactured_at: 2019-07-30
+ warranty_end: 2026-07-31
+ mercantour5-4:
+ chassis:
+ manufactured_at: 2019-07-30
+ warranty_end: 2026-07-31
mercantour6:
nodes:
mercantour6-1:
diff --git a/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml b/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml
index 582547d48f7..5edcf3132f3 100644
--- a/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml
+++ b/input/grid5000/sites/sophia/clusters/mercantour5/mercantour5.yaml
@@ -9,9 +9,6 @@ queues:
- testing
nodes:
mercantour5-[1-4]:
- chassis:
- manufactured_at: 2019-07-30
- warranty_end: 2026-07-31
supported_job_types:
deploy: true
besteffort: true
--
GitLab