Use only ghaf-hw-test job

Use ghaf-hw-test job for every pipeline HW testing and remove ghaf-parallel-hw-test jenkinsfile. Signed-off-by: Ville-Pekka Juntunen <[email protected]>
tiiuae · Nov 28, 2024 · 745f7d8 · 745f7d8
1 parent e114cd3
commit 745f7d8
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 390 deletions.
diff --git a/ghaf-hw-test.groovy b/ghaf-hw-test.groovy
@@ -208,15 +208,14 @@ pipeline {
             unmount_cmd = "/run/wrappers/bin/sudo usbsdmux ${muxport} dut"
           } else {
             serial = get_test_conf_property(CONF_FILE_PATH, env.DEVICE_NAME, 'usbhub_serial')
-            dgrep = 'PSSD'
             mount_cmd = "/run/wrappers/bin/sudo AcronameHubCLI -u 0 -s ${serial}; sleep 10"
             unmount_cmd = "/run/wrappers/bin/sudo AcronameHubCLI -u 1 -s ${serial}"
           }
           env.DEVICE_TAG = params.DEVICE_CONFIG_NAME
           // Mount the target disk
           sh "${mount_cmd}"
           // Read the device name
-          dev = run_cmd("lsblk -o model,name | grep '${dgrep}' | rev | cut -d ' ' -f 1 | rev | grep .")
+          dev = get_test_conf_property(CONF_FILE_PATH, env.DEVICE_NAME, 'ext_drive_by-id')
           println "Using device '$dev'"
           // Wipe possible ZFS leftovers, more details here:
           // https://github.com/tiiuae/ghaf/blob/454b18bc/packages/installer/ghaf-installer.sh#L75
@@ -226,18 +225,18 @@ pipeline {
             SECTOR = 512
             MIB_TO_SECTORS = 20480
             // Disk size in 512-byte sectors
-            SECTORS = sh(script: "/run/wrappers/bin/sudo blockdev --getsz /dev/${dev}", returnStdout: true).trim()
+            SECTORS = sh(script: "/run/wrappers/bin/sudo blockdev --getsz /dev/disk/by-id/${dev}", returnStdout: true).trim()
             // Unmount possible mounted filesystems
-            sh "sync; /run/wrappers/bin/sudo umount -q /dev/${dev}* || true"
+            sh "sync; /run/wrappers/bin/sudo umount -q /dev/disk/by-id/${dev}* || true"
             // Wipe first 10MiB of disk
-            sh "/run/wrappers/bin/sudo dd if=/dev/zero of=/dev/${dev} bs=${SECTOR} count=${MIB_TO_SECTORS} conv=fsync status=none"
+            sh "/run/wrappers/bin/sudo dd if=/dev/zero of=/dev/disk/by-id/${dev} bs=${SECTOR} count=${MIB_TO_SECTORS} conv=fsync status=none"
             // Wipe last 10MiB of disk
-            sh "/run/wrappers/bin/sudo dd if=/dev/zero of=/dev/${dev} bs=${SECTOR} count=${MIB_TO_SECTORS} seek=\$(( ${SECTORS} - ${MIB_TO_SECTORS} )) conv=fsync status=none"
+            sh "/run/wrappers/bin/sudo dd if=/dev/zero of=/dev/disk/by-id/${dev} bs=${SECTOR} count=${MIB_TO_SECTORS} seek=\$(( ${SECTORS} - ${MIB_TO_SECTORS} )) conv=fsync status=none"
           }
           // Write the image
           img_relpath = run_cmd("find ${TMP_IMG_DIR} -type f -print -quit | grep .")
           println "Using image '$img_relpath'"
-          sh "/run/wrappers/bin/sudo dd if=${img_relpath} of=/dev/${dev} bs=1M status=progress conv=fsync"
+          sh "/run/wrappers/bin/sudo dd if=${img_relpath} of=/dev/disk/by-id/${dev} bs=1M status=progress conv=fsync"
           // Unmount
           sh "${unmount_cmd}"
         }

diff --git a/ghaf-nightly-pipeline.groovy b/ghaf-nightly-pipeline.groovy
@@ -66,23 +66,23 @@ def targets = [
   ],
   [ system: "aarch64-linux", target: "nxp-imx8mp-evk-debug",
     archive: true, scs: true
-  ], 
+  ],
 ]
 
 def hydrajobs_targets = [
   // nvidia orin with bpmp enabled
-  [ system: "aarch64-linux",target: "nvidia-jetson-orin-agx-debug-bpmp", 
+  [ system: "aarch64-linux",target: "nvidia-jetson-orin-agx-debug-bpmp",
     archive: true
-  ], 
-  [ system: "aarch64-linux",target: "nvidia-jetson-orin-nx-debug-bpmp", 
+  ],
+  [ system: "aarch64-linux",target: "nvidia-jetson-orin-nx-debug-bpmp",
     archive: true
-  ], 
-  [ system: "x86_64-linux", target: "nvidia-jetson-orin-agx-debug-bpmp-from-x86_64", 
+  ],
+  [ system: "x86_64-linux", target: "nvidia-jetson-orin-agx-debug-bpmp-from-x86_64",
     archive: true
-  ], 
-  [ system: "x86_64-linux", target: "nvidia-jetson-orin-nx-debug-bpmp-from-x86_64", 
+  ],
+  [ system: "x86_64-linux", target: "nvidia-jetson-orin-nx-debug-bpmp-from-x86_64",
     archive: true
-  ], 
+  ],
 ]
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/ghaf-parallel-hw-test.groovy b/ghaf-parallel-hw-test.groovy