"kpartx -av *.raw" will fail when "losetup -f" can not generate loop file

Change-Id: I32d598366df0337576e4455af9fc18fad69d96b0

diff --git a/cases/create/func_cases/mic_cr_auto_raw.case b/cases/create/func_cases/mic_cr_auto_raw.case
index 6eba292..fea709b 100755 (executable)
--- a/cases/create/func_cases/mic_cr_auto_raw.case
+++ b/cases/create/func_cases/mic_cr_auto_raw.case
@@ -40,6 +40,16 @@ sudo bunzip2 -d mic-output/$bz2img
 raw_image=$(ls mic-output/ivi-*-sdb.raw)
 sudo mkdir -p mic-output/ivi_dir/boot
 kpartx_path=$(sudo which kpartx)
+distro=$(python -c 'import platform;print platform.linux_distribution()[0].lower().rstrip()')
+echo $distro
+if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then
+    modprobe_path=$(sudo which modprobe)
+    rmmod_path=$(sudo which rmmod)
+
+    sudo $modprobe_path loop
+    sudo $rmmod_path loop
+fi
+
 loop_device=$(sudo $losetup_path -f)
 sudo $losetup_path $loop_device $raw_image
 for i in {1..5}

diff --git a/cases/create/func_cases/mic_cr_auto_raw_gpt.case b/cases/create/func_cases/mic_cr_auto_raw_gpt.case
index cf2aec6..8433991 100755 (executable)
--- a/cases/create/func_cases/mic_cr_auto_raw_gpt.case
+++ b/cases/create/func_cases/mic_cr_auto_raw_gpt.case
@@ -19,6 +19,16 @@ sudo bunzip2 -d mic-output/$bz2img
 raw_image=$(ls mic-output/ivi_with_installerfw-*-sdb.raw)
 sudo mkdir -p mic-output/ivi_dir/boot
 kpartx_path=$(sudo which kpartx)
+distro=$(python -c 'import platform;print platform.linux_distribution()[0].lower().rstrip()')
+echo $distro
+if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then
+    modprobe_path=$(sudo which modprobe)
+    rmmod_path=$(sudo which rmmod)
+
+    sudo $modprobe_path loop
+    sudo $rmmod_path loop
+fi
+
 loop_device=$(sudo $losetup_path -f)
 sudo $losetup_path $loop_device $raw_image
 for i in {1..5}

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 554e46e..20fb33a 100755 (executable)
--- a/cases/create/mixed_cases/mic_cr_raw_active_partition.case
+++ b/cases/create/mixed_cases/mic_cr_raw_active_partition.case
@@ -17,6 +17,16 @@ grep "Finished" log.file
 raw_name=$(ls mic-output/ivi_with_active_partition-*-sdb.raw)
 test -f $raw_name
 kpartx_path=$(sudo which kpartx)
+distro=$(python -c 'import platform;print platform.linux_distribution()[0].lower().rstrip()')
+echo $distro
+if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then
+    modprobe_path=$(sudo which modprobe)
+    rmmod_path=$(sudo which rmmod)
+
+    sudo $modprobe_path loop
+    sudo $rmmod_path loop
+fi
+
 sudo $kpartx_path -av $raw_name
 sleep 2
 blkid_path=$(sudo which blkid)

diff --git a/cases/create/mixed_cases/mic_cr_raw_locale.case b/cases/create/mixed_cases/mic_cr_raw_locale.case
index bbdf600..8d74274 100755 (executable)
--- a/cases/create/mixed_cases/mic_cr_raw_locale.case
+++ b/cases/create/mixed_cases/mic_cr_raw_locale.case
@@ -19,6 +19,16 @@ sudo $losetup_path -a | wc -l | xargs test 0 -eq
 raw_image=$(ls mic-output/ivi-*-sdb.raw)
 sudo mkdir -p mic-output/ivi_dir/boot
 kpartx_path=$(sudo which kpartx)
+distro=$(python -c 'import platform;print platform.linux_distribution()[0].lower().rstrip()')
+echo $distro
+if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then
+    modprobe_path=$(sudo which modprobe)
+    rmmod_path=$(sudo which rmmod)
+
+    sudo $modprobe_path loop
+    sudo $rmmod_path loop
+fi
+
 for i in {1..5}
 do
     kpartx_output=$(sudo $kpartx_path -av $raw_image)

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 a754aef..8f3af66 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
@@ -15,6 +15,16 @@ sudo $losetup_path -a | wc -l | xargs test 0 -eq
 raw_image=$(ls mic-output/ivi-*-sdb.raw)
 sudo mkdir -p mic-output/ivi_dir/boot
 kpartx_path=$(sudo which kpartx)
+distro=$(python -c 'import platform;print platform.linux_distribution()[0].lower().rstrip()')
+echo $distro
+if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then
+    modprobe_path=$(sudo which modprobe)
+    rmmod_path=$(sudo which rmmod)
+
+    sudo $modprobe_path loop
+    sudo $rmmod_path loop
+fi
+
 for i in {1..5}
 do
     kpartx_output=$(sudo $kpartx_path -av $raw_image)

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 544c3da..dfeefad 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
@@ -15,6 +15,16 @@ sudo $losetup_path -a | wc -l | xargs test 0 -eq
 raw_image=$(ls mic-output/ivi-*-sdb.raw)
 sudo mkdir -p mic-output/ivi_dir/boot
 kpartx_path=$(sudo which kpartx)
+distro=$(python -c 'import platform;print platform.linux_distribution()[0].lower().rstrip()')
+echo $distro
+if [ "$distro" = "fedora" ] || [ "$distro" = "centos linux" ]; then
+    modprobe_path=$(sudo which modprobe)
+    rmmod_path=$(sudo which rmmod)
+
+    sudo $modprobe_path loop
+    sudo $rmmod_path loop
+fi
+
 for i in {1..5}
 do
     kpartx_output=$(sudo $kpartx_path -av $raw_image)

diff --git a/sudoers.itest_cases_mic b/sudoers.itest_cases_mic
index 66f46f9..34beae0 100644 (file)
--- a/sudoers.itest_cases_mic
+++ b/sudoers.itest_cases_mic
@@ -7,6 +7,8 @@ Cmnd_Alias BUNZIP2 = /bin/bunzip2, /usr/bin/bunzip2
 Cmnd_Alias MKDIR = /usr/bin/mkdir, /bin/mkdir
 Cmnd_Alias WHICH = /usr/bin/which
 Cmnd_Alias KPARTX = /sbin/kpartx, /usr/sbin/kpartx
+Cmnd_Alias MODPROBE = /sbin/modprobe, /usr/sbin/modprobe
+Cmnd_Alias RMMOD = /sbin/rmmod, /usr/sbin/rmmod
 Cmnd_Alias UMOUNT = /bin/umount, /usr/bin/umount
 Cmnd_Alias MOUNT = /bin/mount, /usr/bin/mount
 Cmnd_Alias LOSETUP = /sbin/losetup, /usr/sbin/losetup
@@ -33,5 +35,5 @@ Cmnd_Alias YUM = /usr/bin/yum
 Cmnd_Alias ZYPPER = /usr/bin/zypper
 Cmnd_Alias APTGET = /usr/bin/apt-get
 Cmnd_Alias RPM = /usr/bin/rpm, /bin/rpm
-build ALL=(ALL) NOPASSWD: MIC, TEST, RM, SETENFORCE, TAR, BUNZIP2, MKDIR, CHROOT, WHICH, KPARTX, UMOUNT, MOUNT, LOSETUP, PARTED, CREATEREPO, XARGS, BLKID, EGREP, GUNZIP, UNZIP, MV, CP, SED, FDISK, SPM, LZOP, PYTHON, LS, MD5SUM, SHA1SUM, SHA256SUM, YUM, ZYPPER, APTGET, RPM
+build ALL=(ALL) NOPASSWD: MIC, TEST, RM, SETENFORCE, TAR, BUNZIP2, MKDIR, CHROOT, WHICH, KPARTX, MODPROBE, RMMOD, UMOUNT, MOUNT, LOSETUP, PARTED, CREATEREPO, XARGS, BLKID, EGREP, GUNZIP, UNZIP, MV, CP, SED, FDISK, SPM, LZOP, PYTHON, LS, MD5SUM, SHA1SUM, SHA256SUM, YUM, ZYPPER, APTGET, RPM
 Defaults    env_keep+="http_proxy https_proxy no_proxy"