mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
qemuimagetest: Use the same image in sanity testing to fix the timeout issue on autobuilder
Fixes [BUGID #595] Because of the QEMU booting slowness issue(see bug #646 and #618), autobuilder may suffer a timeout issue when running sanity test. We introduce variable SHARE_IMAGE here to fix the issue. It is by default set to 1. Poky will copy latest built-out image and keep using it in sanity testing. If it is set to 0, latest built-out image will be copied and tested for each case, which will take much time. Signed-off-by Jiajun Xu <jiajun.xu@intel.com>
This commit is contained in:
@@ -383,9 +383,16 @@ Test_Create_Qemu()
|
||||
TEST_ROOTFS_IMAGE="${TEST_TMP}/${QEMUTARGET}-${QEMUARCH}-test.ext3"
|
||||
|
||||
CP=`which cp`
|
||||
|
||||
# When SHARE_IMAGE is set, we use the existing image under tmp folder
|
||||
if [ -e "$TEST_ROOTFS_IMAGE" ]; then
|
||||
if [ ${SHARE_IMAGE} -eq 1 ]; then
|
||||
ROOTFS_IMAGE="$TEST_ROOTFS_IMAGE"
|
||||
TEST_ROOTFS_IMAGE="${TEST_TMP}/${QEMUTARGET}-${QEMUARCH}-shared-test.ext3"
|
||||
fi
|
||||
rm -rf $TEST_ROOTFS_IMAGE
|
||||
fi
|
||||
|
||||
$CP $ROOTFS_IMAGE $TEST_ROOTFS_IMAGE
|
||||
|
||||
if [ $? -ne 0 ]; then
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
. $POKYBASE/scripts/qemuimage-testlib
|
||||
|
||||
TIMEOUT=360
|
||||
TIMEOUT=200
|
||||
RET=1
|
||||
|
||||
# Start qemu and check its network
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
. $POKYBASE/scripts/qemuimage-testlib
|
||||
|
||||
TIMEOUT=360
|
||||
TIMEOUT=200
|
||||
RET=1
|
||||
|
||||
# Start qemu and check its network
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
. $POKYBASE/scripts/qemuimage-testlib
|
||||
|
||||
TIMEOUT=360
|
||||
TIMEOUT=200
|
||||
RET=1
|
||||
|
||||
# Start qemu and check its network
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
. $POKYBASE/scripts/qemuimage-testlib
|
||||
|
||||
TIMEOUT=360
|
||||
TIMEOUT=200
|
||||
RET=1
|
||||
|
||||
# Start qemu and check its network
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
. $POKYBASE/scripts/qemuimage-testlib
|
||||
|
||||
TIMEOUT=360
|
||||
TIMEOUT=200
|
||||
RET=1
|
||||
SPID=0
|
||||
i=0
|
||||
|
||||
@@ -13,7 +13,12 @@
|
||||
|
||||
. $POKYBASE/scripts/qemuimage-testlib
|
||||
|
||||
TIMEOUT=360
|
||||
if [ $SHARE_IMAGE -eq 0 ]; then
|
||||
TIMEOUT=200
|
||||
elif [ $SHARE_IMAGE -eq 1 ]; then
|
||||
TIMEOUT=500
|
||||
fi
|
||||
|
||||
RET=1
|
||||
i=0
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
. $POKYBASE/scripts/qemuimage-testlib
|
||||
|
||||
TIMEOUT=360
|
||||
TIMEOUT=200
|
||||
RET=1
|
||||
|
||||
# Start qemu and check its network
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
. $POKYBASE/scripts/qemuimage-testlib
|
||||
|
||||
TIMEOUT=360
|
||||
TIMEOUT=200
|
||||
RET=1
|
||||
|
||||
# Start qemu and check its network
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
. $POKYBASE/scripts/qemuimage-testlib
|
||||
|
||||
TIMEOUT=360
|
||||
TIMEOUT=200
|
||||
RET=1
|
||||
|
||||
# Start qemu and check its network
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
sanity shutdown
|
||||
sanity boot
|
||||
sanity ssh
|
||||
sanity scp
|
||||
sanity dmesg
|
||||
sanity shutdown
|
||||
sanity zypper_help
|
||||
sanity zypper_search
|
||||
sanity rpm_query
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
sanity shutdown
|
||||
sanity boot
|
||||
sanity ssh
|
||||
sanity scp
|
||||
sanity dmesg
|
||||
sanity shutdown
|
||||
sanity zypper_help
|
||||
sanity zypper_search
|
||||
sanity rpm_query
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
sanity shutdown
|
||||
sanity boot
|
||||
sanity ssh
|
||||
sanity scp
|
||||
sanity dmesg
|
||||
sanity shutdown
|
||||
sanity zypper_help
|
||||
sanity zypper_search
|
||||
sanity rpm_query
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
sanity shutdown
|
||||
sanity boot
|
||||
sanity ssh
|
||||
sanity scp
|
||||
sanity dmesg
|
||||
sanity shutdown
|
||||
sanity zypper_help
|
||||
sanity zypper_search
|
||||
sanity rpm_query
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
sanity shutdown
|
||||
sanity boot
|
||||
sanity ssh
|
||||
sanity scp
|
||||
sanity dmesg
|
||||
sanity shutdown
|
||||
sanity zypper_help
|
||||
sanity zypper_search
|
||||
sanity rpm_query
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
sanity shutdown
|
||||
sanity boot
|
||||
sanity ssh
|
||||
sanity scp
|
||||
sanity dmesg
|
||||
sanity shutdown
|
||||
sanity zypper_help
|
||||
sanity zypper_search
|
||||
sanity rpm_query
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
sanity shutdown
|
||||
sanity boot
|
||||
sanity ssh
|
||||
sanity scp
|
||||
sanity dmesg
|
||||
sanity shutdown
|
||||
sanity zypper_help
|
||||
sanity zypper_search
|
||||
sanity rpm_query
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
sanity shutdown
|
||||
sanity boot
|
||||
sanity ssh
|
||||
sanity scp
|
||||
sanity dmesg
|
||||
sanity shutdown
|
||||
sanity zypper_help
|
||||
sanity zypper_search
|
||||
sanity rpm_query
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
sanity shutdown
|
||||
sanity boot
|
||||
sanity ssh
|
||||
sanity scp
|
||||
sanity dmesg
|
||||
sanity shutdown
|
||||
sanity zypper_help
|
||||
sanity zypper_search
|
||||
sanity rpm_query
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
sanity shutdown
|
||||
sanity boot
|
||||
sanity ssh
|
||||
sanity scp
|
||||
sanity dmesg
|
||||
sanity shutdown
|
||||
sanity zypper_help
|
||||
sanity zypper_search
|
||||
sanity rpm_query
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
sanity shutdown
|
||||
sanity boot
|
||||
sanity ssh
|
||||
sanity scp
|
||||
sanity dmesg
|
||||
sanity shutdown
|
||||
sanity zypper_help
|
||||
sanity zypper_search
|
||||
sanity rpm_query
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
sanity shutdown
|
||||
sanity boot
|
||||
sanity ssh
|
||||
sanity scp
|
||||
sanity dmesg
|
||||
sanity shutdown
|
||||
sanity zypper_help
|
||||
sanity zypper_search
|
||||
sanity rpm_query
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
sanity shutdown
|
||||
sanity boot
|
||||
sanity ssh
|
||||
sanity scp
|
||||
sanity dmesg
|
||||
sanity shutdown
|
||||
sanity zypper_help
|
||||
sanity zypper_search
|
||||
sanity rpm_query
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
sanity shutdown
|
||||
sanity boot
|
||||
sanity ssh
|
||||
sanity scp
|
||||
sanity dmesg
|
||||
sanity shutdown
|
||||
sanity zypper_help
|
||||
sanity zypper_search
|
||||
sanity rpm_query
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
sanity shutdown
|
||||
sanity boot
|
||||
sanity ssh
|
||||
sanity scp
|
||||
sanity dmesg
|
||||
sanity shutdown
|
||||
sanity zypper_help
|
||||
sanity zypper_search
|
||||
sanity rpm_query
|
||||
|
||||
Reference in New Issue
Block a user