Use kpartx -d /dev/loop to delete raw image in openSUSE_42.1

Change-Id: Ibdd2c90f551f6bb0301153997ac79a087b493eab
Signed-off-by: Jiankang Fan <jiankang.fan@samsung.com>

diff --git a/cases/create/mixed_cases/mic_cr_raw_active_partition.case b/cases/create/mixed_cases/mic_cr_raw_active_partition.case
index 20fb33a4afeaaba380602eb36e42552b6edf0498..a333644e25ac7a0b7e1970487e26120560a4d73d 100755 (executable)
--- a/cases/create/mixed_cases/mic_cr_raw_active_partition.case
+++ b/cases/create/mixed_cases/mic_cr_raw_active_partition.case
@@ -34,7 +34,15 @@ blkid_output=$(sudo $blkid_path -L boot | sed 's/.*loop\([0-9]*\)p\([0-9]\)/\2/'
 parted_path=$(sudo which parted)
 parted_boot_output=$(sudo $parted_path  $raw_name print| grep 'boot' | awk '{print $1}')
 test  $blkid_output -eq $parted_boot_output
-sudo $kpartx_path -d $raw_name
+linux_distro=$(python -c 'import platform; print platform.linux_distribution();')
+if [ !`echo $linux_distro |  grep -E "openSUSE.*42.*"` ]; then
+    sudo $kpartx_path -d $raw_name
+else
+
+    loop_device=`$losetup_path -a | awk -F : '{print $1}'`
+    sudo $kpartx_path -sd $loop_device
+    sudo $losetup_path -d $loop_device
+fi
 sudo $losetup_path -a
 sudo $losetup_path -a | wc -l | xargs test 0 -eq
 ]]></steps>

diff --git a/cases/create/mixed_cases/mic_cr_raw_locale.case b/cases/create/mixed_cases/mic_cr_raw_locale.case
index ff9f0f64a87cf0fa5e2ffa7a516173994877e8f1..b267f4ad04a451af6a6042e16bac4171f8159551 100755 (executable)
--- a/cases/create/mixed_cases/mic_cr_raw_locale.case
+++ b/cases/create/mixed_cases/mic_cr_raw_locale.case
@@ -65,7 +65,14 @@ if [ -f $raw_image ]; then
       test -d mic-output/ivi_dir && sudo umount -l mic-output/ivi_dir
       test -d mic-output/ivi_dir/boot && sudo umount -l mic-output/ivi_dir/boot
       kpartx_path=$(sudo which kpartx)
-      sudo $kpartx_path -d $raw_image
+      linux_distro=$(python -c 'import platform; print platform.linux_distribution();')
+      if [ !`echo $linux_distro |  grep -E "openSUSE.*42.*"` ]; then
+          sudo $kpartx_path -d $raw_image
+      else
+          loop_device=`sudo losetup -a | grep 'ivi' | awk -F : '{print $1}'`
+          sudo $kpartx_path -sd $loop_device
+          sudo losetup -d $loop_device
+      fi
       if sudo losetup -a | grep "ivi"; then
           sleep 2
       else

diff --git a/cases/create/opt_cases/mic_cr_raw_fstab-entry-name.case b/cases/create/opt_cases/mic_cr_raw_fstab-entry-name.case
index 6b3c1b300e02f201eb7310909f2482773741785d..53a239494e2db8ca6b0651901a414a2debbb3c75 100755 (executable)
--- a/cases/create/opt_cases/mic_cr_raw_fstab-entry-name.case
+++ b/cases/create/opt_cases/mic_cr_raw_fstab-entry-name.case
@@ -63,7 +63,14 @@ if [ -f $raw_image ];then
     test -d mic-output/ivi_dir && sudo umount -l mic-output/ivi_dir
     test -d mic-output/ivi_dir/boot && sudo umount -l mic-output/ivi_dir/boot
     kpartx_path=$(sudo which kpartx)
-    sudo $kpartx_path -d $raw_image
+    linux_distro=$(python -c 'import platform; print platform.linux_distribution();')
+    if [ !`echo $linux_distro |  grep -E "openSUSE.*42.*"` ]; then
+        sudo $kpartx_path -d $raw_image
+    else
+        loop_device=`sudo $losetup_path -a | grep "ivi" | awk -F ":" '{print $1}'`
+        sudo $kpartx_path -sd $loop_device
+        sudo $losetup_path -d $loop_device
+    fi
     if sudo $losetup_path -a | grep "ivi"; then
         sleep 2
     else

diff --git a/cases/create/opt_cases/mic_cr_raw_fstab-entry-uuid.case b/cases/create/opt_cases/mic_cr_raw_fstab-entry-uuid.case
index 2911432d278ffc198c23148e4cbb82654eebc991..8c9ef556e123594c8b5d35a015719f68e68399d7 100755 (executable)
--- a/cases/create/opt_cases/mic_cr_raw_fstab-entry-uuid.case
+++ b/cases/create/opt_cases/mic_cr_raw_fstab-entry-uuid.case
@@ -63,7 +63,14 @@ if [ -f $raw_image ];then
     test -d mic-output/ivi_dir && sudo umount -l mic-output/ivi_dir
     test -d mic-output/ivi_dir/boot && sudo umount -l mic-output/ivi_dir/boot
     kpartx_path=$(sudo which kpartx)
-    sudo $kpartx_path -d $raw_image
+    linux_distro=$(python -c 'import platform; print platform.linux_distribution();')
+    if [ !`echo $linux_distro |  grep -E "openSUSE.*42.*"` ]; then
+        sudo $kpartx_path -d $raw_image
+    else
+        loop_device=`sudo $losetup_path -a | grep "ivi" | awk -F ":" '{print $1}'`
+        sudo $kpartx_path -sd $loop_device
+        sudo $losetup_path -d $loop_device
+    fi
     if sudo $losetup_path -a | grep 'ivi'; then
         sleep 2
     else