remove hardcoded device for kpartx

use the same approach across all the build jobs parsing kpartx -av output

Change-Id: I1e06b1ce874fe8665b289b7199361a77dba96a64
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>

6 files changed, 23 insertions, 14 deletions

diff --git a/96boards-hikey.yaml b/96boards-hikey.yaml
index 0161c17..19324a9 100644
--- a/96boards-hikey.yaml
+++ b/96boards-hikey.yaml
@@ -49,7 +49,7 @@
             cleanup_exit()
             {
               cd ${WORKSPACE}
-              sudo kpartx -dv out/hikey-jessie_*-${BUILD_NUMBER}.img || true
+              sudo kpartx -dv out/hikey-jessie_*.img || true
               rm -rf lci-build-tools
               rm -rf builddir*
               rm -rf out
diff --git a/kvm-guest-image.yaml b/kvm-guest-image.yaml
index 27d2e26..72bb421 100644
--- a/kvm-guest-image.yaml
+++ b/kvm-guest-image.yaml
@@ -72,15 +72,15 @@
             /sbin/parted --script  -- kvm.raw mkpart p ext4 51 -0
             /sbin/parted --script kvm.raw set 1 boot
 
-            for part in `sudo kpartx -av kvm.raw | awk '{print $3}'`; do
-              partnum=`echo ${part} | sed -e 's,.*p,,'`
-              case "${partnum}" in
+            for device in $(sudo kpartx -av kvm.raw | cut -d' ' -f3); do
+              partition=$(echo ${device} | cut -d'p' -f3)
+              case "${partition}" in
                 1)
-                  sudo mkfs.vfat -F 32 /dev/mapper/${part}
+                  sudo mkfs.vfat -F 32 /dev/mapper/${device}
                   ;;
                 2)
-                  sudo mkfs.ext4 /dev/mapper/${part}
-                  sudo mount /dev/mapper/${part} /mnt/
+                  sudo mkfs.ext4 /dev/mapper/${device}
+                  sudo mount /dev/mapper/${device} /mnt/
                   sudo tar xaf ${ROOTFS_BUILD_SUITE}-nano.tgz -C /mnt --strip-components=1
                   cat << EOF | sudo tee /mnt/etc/network/interfaces.d/eth0
             auto lo
diff --git a/lt-qcom-ubuntu-images-3.4.yaml b/lt-qcom-ubuntu-images-3.4.yaml
index 8f552c9..4cf8679 100644
--- a/lt-qcom-ubuntu-images-3.4.yaml
+++ b/lt-qcom-ubuntu-images-3.4.yaml
@@ -73,6 +73,7 @@
             cleanup_exit()
             {
               cd ${WORKSPACE}
+              sudo kpartx -dv out/linaro-${UBUNTU_FLAVOUR}-*.sd.img || true
               rm -rf lci-build-tools
               rm -rf builddir*
               rm -rf out
@@ -152,8 +153,10 @@
 
               # Create eMMC rootfs image(s)
               mkdir rootfs
-              sudo kpartx -av out/linaro-${UBUNTU_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.sd.img
-              sudo mount -o loop /dev/mapper/loop0p2 rootfs
+              for device in $(sudo kpartx -av out/linaro-${UBUNTU_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.sd.img | cut -d' ' -f3); do
+                partition=$(echo ${device} | cut -d'p' -f3)
+                [ "${partition}" = "2" ] && sudo mount -o loop /dev/mapper/${device} rootfs
+              done
 
               [ "${rootfs}" = "developer" ] && cat << EOF | sudo tee rootfs/etc/network/interfaces.d/eth0
             auto eth0
diff --git a/lt-qcom-ubuntu-images-arm64.yaml b/lt-qcom-ubuntu-images-arm64.yaml
index 2bdd785..ab89a4e 100644
--- a/lt-qcom-ubuntu-images-arm64.yaml
+++ b/lt-qcom-ubuntu-images-arm64.yaml
@@ -76,7 +76,7 @@
             cleanup_exit()
             {
               cd ${WORKSPACE}
-              sudo kpartx -dv out/linaro-${UBUNTU_FLAVOUR}-*-${PLATFORM_NAME}-${VERSION}.sd.img || true
+              sudo kpartx -dv out/linaro-${UBUNTU_FLAVOUR}-*.sd.img || true
               rm -rf lci-build-tools
               rm -rf builddir*
               rm -rf out
diff --git a/lt-qcom-ubuntu-images-tracking.yaml b/lt-qcom-ubuntu-images-tracking.yaml
index d2701ed..554163d 100644
--- a/lt-qcom-ubuntu-images-tracking.yaml
+++ b/lt-qcom-ubuntu-images-tracking.yaml
@@ -76,6 +76,7 @@
             cleanup_exit()
             {
               cd ${WORKSPACE}
+              sudo kpartx -dv out/linaro-${UBUNTU_FLAVOUR}-*.sd.img || true
               rm -rf lci-build-tools
               rm -rf builddir*
               rm -rf out
@@ -158,8 +159,10 @@
 
               # Create eMMC rootfs image(s)
               mkdir rootfs
-              sudo kpartx -av out/linaro-${UBUNTU_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.sd.img
-              sudo mount -o loop /dev/mapper/loop0p2 rootfs
+              for device in $(sudo kpartx -av out/linaro-${UBUNTU_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.sd.img | cut -d' ' -f3); do
+                partition=$(echo ${device} | cut -d'p' -f3)
+                [ "${partition}" = "2" ] && sudo mount -o loop /dev/mapper/${device} rootfs
+              done
 
               [ "${rootfs}" = "developer" ] && cat << EOF | sudo tee rootfs/etc/network/interfaces.d/eth0
             auto eth0
diff --git a/lt-qcom-ubuntu-images.yaml b/lt-qcom-ubuntu-images.yaml
index 3a316aa..b58d102 100644
--- a/lt-qcom-ubuntu-images.yaml
+++ b/lt-qcom-ubuntu-images.yaml
@@ -76,6 +76,7 @@
             cleanup_exit()
             {
               cd ${WORKSPACE}
+              sudo kpartx -dv out/linaro-${UBUNTU_FLAVOUR}-*.sd.img || true
               rm -rf lci-build-tools
               rm -rf builddir*
               rm -rf out
@@ -158,8 +159,10 @@
 
               # Create eMMC rootfs image(s)
               mkdir rootfs
-              sudo kpartx -av out/linaro-${UBUNTU_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.sd.img
-              sudo mount -o loop /dev/mapper/loop0p2 rootfs
+              for device in $(sudo kpartx -av out/linaro-${UBUNTU_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.sd.img | cut -d' ' -f3); do
+                partition=$(echo ${device} | cut -d'p' -f3)
+                [ "${partition}" = "2" ] && sudo mount -o loop /dev/mapper/${device} rootfs
+              done
 
               [ "${rootfs}" = "developer" ] && cat << EOF | sudo tee rootfs/etc/network/interfaces.d/eth0
             auto eth0