diff --git a/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json b/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json index 4b82c1a2bfd82deb73172d69a9d21f017b8fafd7..92bf95b74f14d3288bf23b360484dab8d2521055 100644 --- a/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json +++ b/data/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.json @@ -326,8 +326,8 @@ }, { "by_id": "/dev/disk/by-id/wwn-0x500a075129de049a", - "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:2:0", - "firmware_version": "D3DJ004", + "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0", + "firmware_version": "D3DJ008", "id": "disk1", "interface": "SATA", "model": "MTFDDAK960TDT", diff --git a/input/grid5000/sites/nancy/clusters/grouille/grouille.yaml b/input/grid5000/sites/nancy/clusters/grouille/grouille.yaml index 0b9a169400c82ef4b751eb635e5136e4e48db353..529571b26f52d2e4555564a6063296e40729af01 100644 --- a/input/grid5000/sites/nancy/clusters/grouille/grouille.yaml +++ b/input/grid5000/sites/nancy/clusters/grouille/grouille.yaml @@ -41,6 +41,16 @@ nodes: enabled: false mountable: false mounted: false + grouille-1: + storage_devices: + pci-0000:01:00.0-scsi-0:0:1:0: + interface: SAS + id: disk0 + pci-0000:01:00.0-scsi-0:0:0:0: + interface: SATA + id: disk1 + reservation: true + grouille-2: storage_devices: pci-0000:01:00.0-scsi-0:0:1:0: interface: SAS diff --git a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml index 6f1f79ab584fabaaa3e2ef2295db56fc77c0d29d..0158962d64023fab97ea32a551e0c3bf3f6ce30f 100644 --- a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml +++ b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml @@ -155,6 +155,13 @@ grouille-1: vendor: AMD version: 7452 storage_devices: + pci-0000:01:00.0-scsi-0:0:0:0: + by_id: "/dev/disk/by-id/wwn-0x500a075129de049a" + by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0" + firmware_version: D3DJ008 + model: MTFDDAK960TDT + size: 960197124096 + storage: SSD pci-0000:01:00.0-scsi-0:0:1:0: by_id: "/dev/disk/by-id/wwn-0x58ce38ee20f6cc95" by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:1:0" @@ -162,12 +169,5 @@ grouille-1: model: KRM5XVUG1T92 size: 1920383410176 storage: SSD - pci-0000:01:00.0-scsi-0:0:2:0: - by_id: "/dev/disk/by-id/wwn-0x500a075129de049a" - by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:2:0" - firmware_version: D3DJ004 - model: MTFDDAK960TDT - size: 960197124096 - storage: SSD supported_job_types: virtual: amd-v diff --git a/lib/refrepo/valid/data/homogeneity.yaml.erb b/lib/refrepo/valid/data/homogeneity.yaml.erb index 66e509c7cbef200b7077a93b84c903dcf7f6d07f..217698dcaa3fd44f88280409cac6adfa6fcd2f66 100644 --- a/lib/refrepo/valid/data/homogeneity.yaml.erb +++ b/lib/refrepo/valid/data/homogeneity.yaml.erb @@ -220,12 +220,12 @@ nancy: - ~gpu_devices.nvidia3.performance.fp-16 - ~gpu_devices.nvidia3.performance.fp-32 - ~gpu_devices.nvidia3.performance.fp-64 - grele-13: - ~gpu_devices.nvidia0.vbios_version - ~gpu_devices.nvidia1.vbios_version grouille-[1-2]: - - ~storage_devices.pci-0000:01:00.0-scsi-0:0:2:0.firmware_version + - -storage_devices.pci-0000:01:00.0-scsi-0:0:0:0 + - +storage_devices.pci-0000:01:00.0-scsi-0:0:2:0 gros-[27-28]: - ~storage_devices.pci-0000:17:00.0-scsi-0:0:0:0.firmware_version - ~storage_devices.pci-0000:17:00.0-scsi-0:0:0:0.model