[nancy][grouille] dsu - fix grouille-1

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",

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

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

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