From 6cb045c2e9cc99a39c75d0d15d97bd49f3b85fee Mon Sep 17 00:00:00 2001
From: EISENBART Theo <theo.eisenbart@inria.fr>
Date: Wed, 19 Mar 2025 14:56:48 +0100
Subject: [PATCH] [sophia][esterel6] G5K import
---
input/grid5000/ipv4.yaml | 1 +
.../sophia/clusters/esterel6/esterel6.yaml | 19 +++--
.../sophia/clusters/esterel6/nodes.yaml.erb | 80 -------------------
lib/refrepo/net_names_mapping.yaml | 4 +
4 files changed, 17 insertions(+), 87 deletions(-)
delete mode 100644 input/grid5000/sites/sophia/clusters/esterel6/nodes.yaml.erb
diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml
index fda4d9feb73..3b9ddd1ebef 100644
--- a/input/grid5000/ipv4.yaml
+++ b/input/grid5000/ipv4.yaml
@@ -169,6 +169,7 @@ ipv4:
sophia esterel5 eth0 0 0 3 4
sophia esterel5 ib0 0 0 3 4
sophia esterel6 eth0 0 0 3 6
+ sophia esterel6 ib0 0 0 3 6
sophia esterel7 eth0 0 0 3 7
sophia esterel7 ib0 0 0 3 7
sophia esterel8 eth0 0 0 3 9
diff --git a/input/grid5000/sites/sophia/clusters/esterel6/esterel6.yaml b/input/grid5000/sites/sophia/clusters/esterel6/esterel6.yaml
index 06df69da349..feaafd0d07a 100644
--- a/input/grid5000/sites/sophia/clusters/esterel6/esterel6.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel6/esterel6.yaml
@@ -9,9 +9,6 @@ queues:
- testing
nodes:
esterel6-1:
- chassis:
- manufactured_at: 2025-02-26
- warranty_end: 2022-04-17
supported_job_types:
deploy: true
besteffort: true
@@ -29,13 +26,21 @@ nodes:
enabled: true
mountable: true
mounted: true
+ eth1:
+ enabled: false
+ mountable: false
+ mounted: false
+ ib0:
+ mounted: true
+ enabled: true
+ mountable: true
+ netmask: 255.255.240.0
storage_devices:
- disk0: # This field will have to be renamed later.
+ pci-0000:03:00.0-scsi-0:2:0:0:
id: disk0
interface: SAS
- by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0" # this path will have to change later.
software:
- standard-environment: debian11-x64-std # TODO: check that architecture is OK
+ standard-environment: debian11-x64-std
management_tools:
- bmc_vendor_tool: racadm # TODO: replace with bmc_vendor_tool (ipmitool, racadm)
+ bmc_vendor_tool: racadm
nodeset: esterel6
diff --git a/input/grid5000/sites/sophia/clusters/esterel6/nodes.yaml.erb b/input/grid5000/sites/sophia/clusters/esterel6/nodes.yaml.erb
deleted file mode 100644
index 898eaac60bc..00000000000
--- a/input/grid5000/sites/sophia/clusters/esterel6/nodes.yaml.erb
+++ /dev/null
@@ -1,80 +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 = "esterel6"
- nodes_number = 1 # Size of the cluster (number of nodes)
- # MAC addresses declaration
- mac_eth0_list = %w(
-18:66:da:a6:f0:f1
- )
- mac_bmc_list = %w(
-18:66:da:a6:f0:f3
- )
-%>
----
-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: Unknown # Fake model name, will be replaced by g5k-checks
- other_description: description # Fake description, will be replaced by g5k-checks
- vendor: vendor # Fake vendor, will be replaced by g5k-checks
- version: vendor # 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/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml
index 711537eb87c..1b09e39e306 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -419,6 +419,10 @@ esterel7:
enp1s0f0np0: eth0
enp1s0f1: eth1
ibp130s0: ib0
+esterel6:
+ enp1s0f0np0: eth0
+ eno2: eth1
+ ibp130s0: ib0
esterel10:
eno1: eth0
eno2: eth1
--
GitLab