From 8079c52c59e96b230b2bcc8ce0ee4ec3ee9e7a29 Mon Sep 17 00:00:00 2001
From: Nicolas Perrin <nicolas.perrin@inria.fr>
Date: Thu, 12 Aug 2021 15:27:35 +0200
Subject: [PATCH] [nancy/graphique] graphique-1 retired
---
.../clusters/graphique/nodes/graphique-1.json | 269 ------------------
.../sites/nancy/network_equipments/gw.json | 4 -
.../sites/nancy/pdus/graoully-pdu1.json | 3 +-
.../sites/nancy/pdus/graoully-pdu2.json | 1 -
.../nancy/clusters/graphique/graphique.yaml | 6 +-
.../clusters/graphique/graphique_extra.yaml | 2 +-
.../clusters/graphique/graphique_pdu.yaml | 6 -
.../clusters/graphique/nodes/graphique-1.yaml | 130 ---------
.../sites/nancy/networks/gw-nancy.yaml | 2 -
lib/refrepo/valid/data/homogeneity.yaml.erb | 3 +-
10 files changed, 4 insertions(+), 422 deletions(-)
delete mode 100644 data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json
delete mode 100644 input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json
deleted file mode 100644
index 41082651381..00000000000
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json
+++ /dev/null
@@ -1,269 +0,0 @@
-{
- "architecture": {
- "cpu_core_numbering": "round-robin",
- "nb_cores": 12,
- "nb_procs": 2,
- "nb_threads": 24,
- "platform_type": "x86_64"
- },
- "bios": {
- "release_date": "11/02/2019",
- "vendor": "Dell Inc.",
- "version": "2.11.0"
- },
- "bmc_version": "2.70.70.70",
- "chassis": {
- "manufacturer": "Dell Inc.",
- "name": "PowerEdge R730",
- "serial": "BYGMJ32"
- },
- "exotic": false,
- "gpu_devices": {
- "nvidia0": {
- "cpu_affinity": 0,
- "device": "/dev/nvidia0",
- "memory": 6378487808,
- "model": "GeForce GTX TITAN Black",
- "power_default_limit": "250.00 W",
- "vbios_version": "80.80.4E.00.90",
- "vendor": "Nvidia"
- },
- "nvidia1": {
- "cpu_affinity": 1,
- "device": "/dev/nvidia1",
- "memory": 6378487808,
- "model": "GeForce GTX TITAN Black",
- "power_default_limit": "250.00 W",
- "vbios_version": "80.80.4E.00.90",
- "vendor": "Nvidia"
- }
- },
- "kavlan": {
- "eth0": {
- "kavlan-1": "192.168.197.1",
- "kavlan-11": "10.7.217.1",
- "kavlan-12": "10.11.217.1",
- "kavlan-13": "10.15.217.1",
- "kavlan-14": "10.19.217.1",
- "kavlan-16": "10.27.217.1",
- "kavlan-18": "10.35.217.1",
- "kavlan-2": "192.168.213.1",
- "kavlan-20": "10.43.217.1",
- "kavlan-21": "10.47.217.1",
- "kavlan-3": "192.168.229.1",
- "kavlan-4": "10.16.5.1",
- "kavlan-5": "10.16.69.1",
- "kavlan-6": "10.16.133.1",
- "kavlan-7": "10.16.197.1",
- "kavlan-8": "10.17.5.1",
- "kavlan-9": "10.17.69.1"
- }
- },
- "kavlan6": {
- "eth0": {
- "kavlan-1": "2001:660:4406:580:4::1",
- "kavlan-11": "2001:660:4406:1a0:504::1",
- "kavlan-12": "2001:660:4406:2a0:504::1",
- "kavlan-13": "2001:660:4406:4a0:504::1",
- "kavlan-14": "2001:660:4406:5a0:504::1",
- "kavlan-16": "2001:660:4406:7a0:504::1",
- "kavlan-18": "2001:660:4406:8a0:504::1",
- "kavlan-2": "2001:660:4406:581:4::1",
- "kavlan-20": "2001:660:4406:3a0:504::1",
- "kavlan-21": "2001:660:4406:6a0:504::1",
- "kavlan-3": "2001:660:4406:582:4::1",
- "kavlan-4": "2001:660:4406:590:4::1",
- "kavlan-5": "2001:660:4406:591:4::1",
- "kavlan-6": "2001:660:4406:592:4::1",
- "kavlan-7": "2001:660:4406:593:4::1",
- "kavlan-8": "2001:660:4406:594:4::1",
- "kavlan-9": "2001:660:4406:595:4::1"
- }
- },
- "main_memory": {
- "ram_size": 68719476736
- },
- "network_adapters": [
- {
- "bridged": true,
- "device": "eth0",
- "driver": "bnx2x",
- "enabled": true,
- "firmware_version": "FFV15.05.12 bc 7.14.16",
- "interface": "Ethernet",
- "ip": "172.16.67.1",
- "ip6": "2001:660:4406:500:4::1",
- "kavlan": true,
- "mac": "b0:83:fe:e5:c0:54",
- "management": false,
- "model": "NetXtreme II BCM57800 1/10 Gigabit Ethernet",
- "mountable": true,
- "mounted": true,
- "name": "eno1",
- "network_address": "graphique-1.nancy.grid5000.fr",
- "rate": 10000000000,
- "sriov": true,
- "sriov_totalvfs": 16,
- "switch": "gw",
- "switch_port": "Ethernet1/25",
- "vendor": "Broadcom"
- },
- {
- "bridged": false,
- "device": "eth1",
- "driver": "bnx2x",
- "enabled": false,
- "firmware_version": "FFV15.05.12 bc 7.14.16",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "b0:83:fe:e5:c0:56",
- "management": false,
- "model": "NetXtreme II BCM57800 1/10 Gigabit Ethernet",
- "mountable": false,
- "mounted": false,
- "name": "eno2",
- "sriov": true,
- "sriov_totalvfs": 16,
- "vendor": "Broadcom"
- },
- {
- "bridged": false,
- "device": "eth2",
- "driver": "bnx2x",
- "enabled": false,
- "firmware_version": "FFV15.05.12 bc 7.14.16",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "b0:83:fe:e5:c0:58",
- "management": false,
- "model": "NetXtreme II BCM57800 1/10 Gigabit Ethernet",
- "mountable": false,
- "mounted": false,
- "name": "eno3",
- "sriov": false,
- "sriov_totalvfs": 0,
- "vendor": "Broadcom"
- },
- {
- "bridged": false,
- "device": "eth3",
- "driver": "bnx2x",
- "enabled": false,
- "firmware_version": "FFV15.05.12 bc 7.14.16",
- "interface": "Ethernet",
- "kavlan": false,
- "mac": "b0:83:fe:e5:c0:5a",
- "management": false,
- "model": "NetXtreme II BCM57800 1/10 Gigabit Ethernet",
- "mountable": false,
- "mounted": false,
- "name": "eno4",
- "sriov": false,
- "sriov_totalvfs": 0,
- "vendor": "Broadcom"
- },
- {
- "device": "ib0",
- "driver": "mlx4_core",
- "enabled": true,
- "firmware_version": "2.32.5100",
- "guid": "0xf45214030076f241",
- "interface": "InfiniBand",
- "ip": "172.18.67.1",
- "kavlan": false,
- "mac": "f4:52:14:03:00:76:f2:41",
- "management": false,
- "model": "MT27500 Family [ConnectX-3]",
- "mountable": true,
- "mounted": true,
- "name": "ib0",
- "netmask": "255.255.255.0",
- "network_address": "graphique-1-ib0.nancy.grid5000.fr",
- "rate": 56000000000,
- "switch": "sgraoullyib",
- "vendor": "Mellanox Technologies"
- },
- {
- "device": "bmc",
- "enabled": true,
- "interface": "Ethernet",
- "ip": "172.17.67.1",
- "kavlan": false,
- "mac": "b0:83:fe:e4:69:d8",
- "management": true,
- "mountable": false,
- "mounted": false,
- "network_address": "graphique-1-bmc.nancy.grid5000.fr",
- "switch": "sbaie1-ipmi"
- }
- ],
- "operating_system": {
- "cstate_driver": "intel_idle",
- "cstate_governor": "menu",
- "ht_enabled": true,
- "pstate_driver": "intel_pstate",
- "pstate_governor": "performance",
- "turboboost_enabled": true
- },
- "pdu": [
- {
- "port": 9,
- "uid": "graoully-pdu1"
- },
- {
- "port": 5,
- "uid": "graoully-pdu2"
- }
- ],
- "performance": {
- "core_flops": 38400000000,
- "node_flops": 460800000000
- },
- "processor": {
- "cache_l1": null,
- "cache_l1d": 32768,
- "cache_l1i": 32768,
- "cache_l2": 262144,
- "cache_l3": 15728640,
- "clock_speed": 2400000000,
- "ht_capable": true,
- "instruction_set": "x86-64",
- "microarchitecture": "Haswell",
- "microcode": "0x46",
- "model": "Intel Xeon",
- "other_description": "Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz",
- "vendor": "Intel",
- "version": "E5-2620 v3"
- },
- "software": {
- "forced-deployment-timestamp": 202007300948,
- "postinstall-version": "1.2021070100",
- "standard-environment": "debian10-x64-std"
- },
- "storage_devices": [
- {
- "by_id": "/dev/disk/by-id/wwn-0x6b083fe0d4f321001c1251a311fe7e14",
- "by_path": "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0",
- "device": "sda",
- "firmware_version": 4.3,
- "id": "disk0",
- "interface": "RAID-1 (2 disks)",
- "model": "PERC H330 Mini",
- "size": 299439751168,
- "storage": "HDD",
- "vendor": "Dell"
- }
- ],
- "supported_job_types": {
- "besteffort": true,
- "deploy": true,
- "max_walltime": 86400,
- "queues": [
- "admin",
- "production"
- ],
- "virtual": "ivt"
- },
- "type": "node",
- "uid": "graphique-1"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/gw.json b/data/grid5000/sites/nancy/network_equipments/gw.json
index d4026bcf83d..7d4d6cc49a3 100644
--- a/data/grid5000/sites/nancy/network_equipments/gw.json
+++ b/data/grid5000/sites/nancy/network_equipments/gw.json
@@ -183,10 +183,6 @@
"uid": "graphique-2"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet1/25",
- "uid": "graphique-1"
},
{
"kind": "node",
diff --git a/data/grid5000/sites/nancy/pdus/graoully-pdu1.json b/data/grid5000/sites/nancy/pdus/graoully-pdu1.json
index bb93bb57ba0..ce9cdc97cd7 100644
--- a/data/grid5000/sites/nancy/pdus/graoully-pdu1.json
+++ b/data/grid5000/sites/nancy/pdus/graoully-pdu1.json
@@ -31,8 +31,7 @@
"4": "graphite-4",
"5": "graphique-2",
"6": "graphique-3",
- "7": "graphique-4",
- "9": "graphique-1"
+ "7": "graphique-4"
},
"type": "pdu",
"uid": "graoully-pdu1",
diff --git a/data/grid5000/sites/nancy/pdus/graoully-pdu2.json b/data/grid5000/sites/nancy/pdus/graoully-pdu2.json
index a2de4e979dc..4eb6f5a6f0a 100644
--- a/data/grid5000/sites/nancy/pdus/graoully-pdu2.json
+++ b/data/grid5000/sites/nancy/pdus/graoully-pdu2.json
@@ -30,7 +30,6 @@
"23": "graphique-2",
"3": "graphite-3",
"4": "graphite-4",
- "5": "graphique-1",
"6": "graphique-4"
},
"type": "pdu",
diff --git a/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml b/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
index ee23c514639..ed126f38e04 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/graphique.yaml
@@ -9,7 +9,7 @@ queues:
nodes:
# Global node properties
- graphique-[1-6]:
+ graphique-[2-6]:
supported_job_types:
deploy: true
besteffort: true
@@ -62,7 +62,3 @@ nodes:
graphique-[3-]:
supported_job_types:
max_walltime: 604800
-
- graphique-1:
- supported_job_types:
- max_walltime: 86400
diff --git a/input/grid5000/sites/nancy/clusters/graphique/graphique_extra.yaml b/input/grid5000/sites/nancy/clusters/graphique/graphique_extra.yaml
index 38c36f3dca8..afcbbbde61d 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/graphique_extra.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/graphique_extra.yaml
@@ -1,6 +1,6 @@
---
nodes:
- graphique-[1-6]:
+ graphique-[2-6]:
network_adapters:
ib0:
switch: sgraoullyib
diff --git a/input/grid5000/sites/nancy/clusters/graphique/graphique_pdu.yaml b/input/grid5000/sites/nancy/clusters/graphique/graphique_pdu.yaml
index 404d69b35d3..06f0d0effaa 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/graphique_pdu.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/graphique_pdu.yaml
@@ -24,12 +24,6 @@ nodes:
port: 5
- uid: graoully-pdu2
port: 23
- graphique-1:
- pdu:
- - uid: graoully-pdu1
- port: 9
- - uid: graoully-pdu2
- port: 5
graphique-6:
pdu:
- uid: graoully-pdu1
diff --git a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
deleted file mode 100644
index c8493933219..00000000000
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
+++ /dev/null
@@ -1,130 +0,0 @@
-# Generated by g5k-checks (g5k-checks -m api)
----
-graphique-1:
- architecture:
- cpu_core_numbering: round-robin
- nb_cores: 12
- nb_procs: 2
- nb_threads: 24
- platform_type: x86_64
- bios:
- release_date: 11/02/2019
- vendor: Dell Inc.
- version: 2.11.0
- bmc_version: 2.70.70.70
- chassis:
- manufacturer: Dell Inc.
- name: PowerEdge R730
- serial: BYGMJ32
- gpu_devices:
- nvidia0:
- cpu_affinity: 0
- device: "/dev/nvidia0"
- memory: 6378487808
- model: GeForce GTX TITAN Black
- power_default_limit: 250.00 W
- vbios_version: 80.80.4E.00.90
- vendor: Nvidia
- nvidia1:
- cpu_affinity: 1
- device: "/dev/nvidia1"
- memory: 6378487808
- model: GeForce GTX TITAN Black
- power_default_limit: 250.00 W
- vbios_version: 80.80.4E.00.90
- vendor: Nvidia
- main_memory:
- ram_size: 68719476736
- network_adapters:
- bmc:
- ip: 172.17.67.1
- mac: b0:83:fe:e4:69:d8
- management: true
- eth0:
- driver: bnx2x
- firmware_version: FFV15.05.12 bc 7.14.16
- interface: Ethernet
- ip: 172.16.67.1
- mac: b0:83:fe:e5:c0:54
- management: false
- model: NetXtreme II BCM57800 1/10 Gigabit Ethernet
- name: eno1
- rate: 10000000000
- sriov: true
- sriov_totalvfs: 16
- vendor: Broadcom
- eth1:
- driver: bnx2x
- firmware_version: FFV15.05.12 bc 7.14.16
- interface: Ethernet
- mac: b0:83:fe:e5:c0:56
- management: false
- model: NetXtreme II BCM57800 1/10 Gigabit Ethernet
- name: eno2
- sriov: true
- sriov_totalvfs: 16
- vendor: Broadcom
- eth2:
- driver: bnx2x
- firmware_version: FFV15.05.12 bc 7.14.16
- interface: Ethernet
- mac: b0:83:fe:e5:c0:58
- management: false
- model: NetXtreme II BCM57800 1/10 Gigabit Ethernet
- name: eno3
- sriov: false
- sriov_totalvfs: 0
- vendor: Broadcom
- eth3:
- driver: bnx2x
- firmware_version: FFV15.05.12 bc 7.14.16
- interface: Ethernet
- mac: b0:83:fe:e5:c0:5a
- management: false
- model: NetXtreme II BCM57800 1/10 Gigabit Ethernet
- name: eno4
- sriov: false
- sriov_totalvfs: 0
- vendor: Broadcom
- ib0:
- driver: mlx4_core
- firmware_version: 2.32.5100
- guid: '0xf45214030076f241'
- interface: InfiniBand
- ip: 172.18.67.1
- mac: f4:52:14:03:00:76:f2:41
- management: false
- model: MT27500 Family [ConnectX-3]
- name: ib0
- rate: 56000000000
- 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: 262144
- cache_l3: 15728640
- ht_capable: true
- instruction_set: x86-64
- microcode: '0x46'
- model: Intel Xeon
- other_description: Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz
- vendor: Intel
- version: E5-2620 v3
- storage_devices:
- sda:
- by_id: "/dev/disk/by-id/wwn-0x6b083fe0d4f321001c1251a311fe7e14"
- by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
- firmware_version: 4.3
- id: disk0
- model: PERC H330 Mini
- size: 299439751168
- storage: HDD
- supported_job_types:
- virtual: ivt
diff --git a/input/grid5000/sites/nancy/networks/gw-nancy.yaml b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
index a6e972c4748..ba36da32747 100644
--- a/input/grid5000/sites/nancy/networks/gw-nancy.yaml
+++ b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
@@ -177,8 +177,6 @@ gw:
uid: graphique-3
24:
uid: graphique-2
- 25:
- uid: graphique-1
26:
uid: graphique-6
27:
diff --git a/lib/refrepo/valid/data/homogeneity.yaml.erb b/lib/refrepo/valid/data/homogeneity.yaml.erb
index a2dd6b5d691..10c9305a256 100644
--- a/lib/refrepo/valid/data/homogeneity.yaml.erb
+++ b/lib/refrepo/valid/data/homogeneity.yaml.erb
@@ -10,7 +10,6 @@
# - +network_adapters.myri0
#
# nancy:
-# graphique: model differs on graphique-1
# grisou-50+: 2 IB interfaces
# grisou-49+: Doesn't have eth4 link
# griffon-[1-91]: missing some serial
@@ -51,7 +50,7 @@ nancy:
- ~gpu_devices.nvidia3.memory
- ~gpu_devices.nvidia3.model
- graphique-[1-2]:
+ graphique-2:
- ~gpu.gpu_model
- ~gpu.gpu_cores
- ~gpu_devices.nvidia0.vbios_version
--
GitLab