Merge branch 'paradoxe-newdisks' into 'master'

[rennes][paradoxe] Update disks for paradoxe-[4,12]

See merge request !1384

data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-12.json

@@ -239,23 +239,23 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x55cd2e4155ff603d",
+      "by_id": "/dev/disk/by-id/wwn-0x5002538f04521566",
       "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:1:0",
-      "firmware_version": "4IYYHPG3",
+      "firmware_version": "HPG1",
       "id": "disk0",
       "interface": "SATA",
-      "model": "MK001920GYCNF",
+      "model": "MK001920GZXRC",
       "size": 1920383410176,
       "storage": "SSD",
       "vendor": "HP"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x55cd2e4155ff52bc",
+      "by_id": "/dev/disk/by-id/wwn-0x5002538f0452154f",
       "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:2:0",
-      "firmware_version": "4IYYHPG3",
+      "firmware_version": "HPG1",
       "id": "disk1",
       "interface": "SATA",
-      "model": "MK001920GYCNF",
+      "model": "MK001920GZXRC",
       "size": 1920383410176,
       "storage": "SSD",
       "vendor": "HP"

data/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-4.json

@@ -239,23 +239,23 @@
   },
   "storage_devices": [
     {
-      "by_id": "/dev/disk/by-id/wwn-0x55cd2e4155ff6055",
+      "by_id": "/dev/disk/by-id/wwn-0x5002538f04521563",
       "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:1:0",
-      "firmware_version": "4IYYHPG3",
+      "firmware_version": "HPG1",
       "id": "disk0",
       "interface": "SATA",
-      "model": "MK001920GYCNF",
+      "model": "MK001920GZXRC",
       "size": 1920383410176,
       "storage": "SSD",
       "vendor": "HP"
     },
     {
-      "by_id": "/dev/disk/by-id/wwn-0x55cd2e4155ff6056",
+      "by_id": "/dev/disk/by-id/wwn-0x5002538f04521567",
       "by_path": "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:2:0",
-      "firmware_version": "4IYYHPG3",
+      "firmware_version": "HPG1",
       "id": "disk1",
       "interface": "SATA",
-      "model": "MK001920GYCNF",
+      "model": "MK001920GZXRC",
       "size": 1920383410176,
       "storage": "SSD",
       "vendor": "HP"

input/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-12.yaml

@@ -105,17 +105,17 @@ paradoxe-12:
     version: Gold 5320
   storage_devices:
     pci-0000:47:00.0-scsi-0:2:1:0:
-      by_id: "/dev/disk/by-id/wwn-0x55cd2e4155ff603d"
+      by_id: "/dev/disk/by-id/wwn-0x5002538f04521566"
       by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:1:0"
-      firmware_version: 4IYYHPG3
-      model: MK001920GYCNF
+      firmware_version: HPG1
+      model: MK001920GZXRC
       size: 1920383410176
       storage: SSD
     pci-0000:47:00.0-scsi-0:2:2:0:
-      by_id: "/dev/disk/by-id/wwn-0x55cd2e4155ff52bc"
+      by_id: "/dev/disk/by-id/wwn-0x5002538f0452154f"
       by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:2:0"
-      firmware_version: 4IYYHPG3
-      model: MK001920GYCNF
+      firmware_version: HPG1
+      model: MK001920GZXRC
       size: 1920383410176
       storage: SSD
   supported_job_types:

input/grid5000/sites/rennes/clusters/paradoxe/nodes/paradoxe-4.yaml

@@ -105,17 +105,17 @@ paradoxe-4:
     version: Gold 5320
   storage_devices:
     pci-0000:47:00.0-scsi-0:2:1:0:
-      by_id: "/dev/disk/by-id/wwn-0x55cd2e4155ff6055"
+      by_id: "/dev/disk/by-id/wwn-0x5002538f04521563"
       by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:1:0"
-      firmware_version: 4IYYHPG3
-      model: MK001920GYCNF
+      firmware_version: HPG1
+      model: MK001920GZXRC
       size: 1920383410176
       storage: SSD
     pci-0000:47:00.0-scsi-0:2:2:0:
-      by_id: "/dev/disk/by-id/wwn-0x55cd2e4155ff6056"
+      by_id: "/dev/disk/by-id/wwn-0x5002538f04521567"
       by_path: "/dev/disk/by-path/pci-0000:47:00.0-scsi-0:2:2:0"
-      firmware_version: 4IYYHPG3
-      model: MK001920GYCNF
+      firmware_version: HPG1
+      model: MK001920GZXRC
       size: 1920383410176
       storage: SSD
   supported_job_types:

lib/refrepo/valid/data/homogeneity.yaml.erb

@@ -343,17 +343,7 @@ nantes:
     - +kavlan6.eth1
 
 rennes:
-  paradoxe-[2-3]:
-    - ~storage_devices.pci-0000:47:00.0-scsi-0:2:1:0.firmware_version
-    - ~storage_devices.pci-0000:47:00.0-scsi-0:2:1:0.model
-    - ~storage_devices.pci-0000:47:00.0-scsi-0:2:2:0.firmware_version
-    - ~storage_devices.pci-0000:47:00.0-scsi-0:2:2:0.model
-  paradoxe-5:
-    - ~storage_devices.pci-0000:47:00.0-scsi-0:2:1:0.firmware_version
-    - ~storage_devices.pci-0000:47:00.0-scsi-0:2:1:0.model
-    - ~storage_devices.pci-0000:47:00.0-scsi-0:2:2:0.firmware_version
-    - ~storage_devices.pci-0000:47:00.0-scsi-0:2:2:0.model
-  paradoxe-12:
+  paradoxe-[2-4]:
     - ~storage_devices.pci-0000:47:00.0-scsi-0:2:1:0.firmware_version
     - ~storage_devices.pci-0000:47:00.0-scsi-0:2:1:0.model
     - ~storage_devices.pci-0000:47:00.0-scsi-0:2:2:0.firmware_version
@@ -361,10 +351,6 @@ rennes:
   paradoxe-13:
     - ~network_adapters.eth0.firmware_version
     - ~network_adapters.eth1.firmware_version
-    - ~storage_devices.pci-0000:47:00.0-scsi-0:2:1:0.firmware_version
-    - ~storage_devices.pci-0000:47:00.0-scsi-0:2:1:0.model
-    - ~storage_devices.pci-0000:47:00.0-scsi-0:2:2:0.firmware_version
-    - ~storage_devices.pci-0000:47:00.0-scsi-0:2:2:0.model
   paradoxe-14:
     - ~network_adapters.eth0.firmware_version
     - ~network_adapters.eth1.firmware_version