summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJiajun Xu <jiajun.xu@intel.com>2011-01-19 00:22:30 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-20 21:36:57 +0000
commit3e052919c9307ba73a1db0f705b7dc1a677cb80f (patch)
tree14861629035fb78eaae19645801f49a608536ecf /scripts
parent50b208612945c638e3f4965ebf90ade4aac5b636 (diff)
downloadpoky-3e052919c9307ba73a1db0f705b7dc1a677cb80f.tar.gz
qemuimagetest: Use same image during sanity testing instead of copying a new image for each case
To reduce the time on sanity testing, we remove variable SHARE_IMAGE and use a new variable TEST_SERIALIZE in local.conf. It is by default set to 1. Poky will copy and boot the to-be tested image for only once. It will not remove or kill the image and test cases will be serialized executed against the same image. If it is set to 0, image is always be copied for each cases, which takes much time. I had a experiment that latest qemuppc sato only takes 7 minutes to finish 9 sanity test cases, which takes more than 20 minutes before. I also removed sanity case "boot" from sato/sdk/lsb because the other cases for these targets already cover the check point of "boot". Signed-off-by Jiajun Xu <jiajun.xu@intel.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/qemuimage-testlib110
-rwxr-xr-xscripts/qemuimage-tests/sanity/compiler2
-rwxr-xr-xscripts/qemuimage-tests/sanity/connman2
-rwxr-xr-xscripts/qemuimage-tests/sanity/dmesg2
-rwxr-xr-xscripts/qemuimage-tests/sanity/rpm_query2
-rwxr-xr-xscripts/qemuimage-tests/sanity/scp2
-rwxr-xr-xscripts/qemuimage-tests/sanity/shutdown11
-rwxr-xr-xscripts/qemuimage-tests/sanity/ssh2
-rwxr-xr-xscripts/qemuimage-tests/sanity/zypper_help2
-rwxr-xr-xscripts/qemuimage-tests/sanity/zypper_search2
-rw-r--r--scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb3
-rw-r--r--scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato3
-rw-r--r--scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk3
-rw-r--r--scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb3
-rw-r--r--scripts/qemuimage-tests/scenario/qemumips/poky-image-sato3
-rw-r--r--scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk3
-rw-r--r--scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb3
-rw-r--r--scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato3
-rw-r--r--scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk3
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb3
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato3
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sdk3
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb3
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86/poky-image-sato3
-rw-r--r--scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk3
25 files changed, 105 insertions, 77 deletions
diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib
index b9afcf5bb6..823cbfa18b 100644
--- a/scripts/qemuimage-testlib
+++ b/scripts/qemuimage-testlib
@@ -39,6 +39,19 @@ Test_Info()
39 echo -e "\tTest_Info: $*" 39 echo -e "\tTest_Info: $*"
40} 40}
41 41
42# function to update target ip address
43# $1 is the process id of the process, which starts the qemu target
44# $2 is the ip address of the target
45Test_Update_IPSAVE()
46{
47 local pid=$1
48 local ip_addr=$2
49
50 if [ "$TEST_SERIALIZE" -eq 1 ]; then
51 echo "$pid $ip_addr" > $TARGET_IPSAVE
52 fi
53}
54
42# function to copy files from host into target 55# function to copy files from host into target
43# $1 is the ip address of target 56# $1 is the ip address of target
44# $2 is the files, which need to be copied into target 57# $2 is the files, which need to be copied into target
@@ -99,6 +112,11 @@ Test_SSH_UP()
99 local timeout=$2 112 local timeout=$2
100 local interval=0 113 local interval=0
101 114
115 # If TEST_SERIALIZE is set, use existing running qemu for testing
116 if [ ${TEST_SERIALIZE} -eq 1 -a -e ${TARGET_IPSAVE} ]; then
117 timeout=50
118 fi
119
102 while [ ${interval} -lt ${timeout} ] 120 while [ ${interval} -lt ${timeout} ]
103 do 121 do
104 Test_SSH ${ip_addr} "hostname" 122 Test_SSH ${ip_addr} "hostname"
@@ -106,13 +124,13 @@ Test_SSH_UP()
106 interval=`expr $interval + 10` 124 interval=`expr $interval + 10`
107 sleep 10 125 sleep 10
108 else 126 else
109 Test_Info "We can ssh on ${ip_addr} now" 127 Test_Info "We can ssh on ${ip_addr} within ${interval} seconds"
110 return 0 128 return 0
111 fi 129 fi
112 130
113 done 131 done
114 132
115 Test_Info "We can not ssh on ${ip_addr} in ${timeout}" 133 Test_Info "We can not ssh on ${ip_addr} in ${timeout} seconds"
116 return 1 134 return 1
117} 135}
118 136
@@ -162,6 +180,8 @@ Test_Kill_Qemu()
162 local ret=0 180 local ret=0
163 local ppid=0 181 local ppid=0
164 local i=0 182 local i=0
183 local index=0
184 local total=0
165 declare local pid 185 declare local pid
166 186
167 # Check if $1 pid exists and is a qemu process 187 # Check if $1 pid exists and is a qemu process
@@ -186,16 +206,39 @@ Test_Kill_Qemu()
186 ret=$? 206 ret=$?
187 done 207 done
188 208
189 # Kill these children pids from the last one 209 # When TEST_SERIALIZE is set, qemu process will not be
190 while [ $i -ne 0 ] 210 # killed until all the cases are finished
191 do 211 if [ ${TEST_SERIALIZE} -eq 1 -a -e ${TEST_STATUS} ]; then
192 i=$((i-1)) 212 index=`sed -n 2p ${TEST_STATUS} | awk '{print $3}'`
193 kill ${pid[$i]} 213 total=`sed -n 2p ${TEST_STATUS} | awk '{print $4}'`
194 sleep 2 214 if [ ${index} != ${total} ]; then
195 done 215 Test_Info "Do not kill the qemu process and use it for later testing"
216 Test_Update_IPSAVE $PID $TARGET_IPADDR
217 else
218 # If it is the last case, let's kill it
219 while [ $i -ne 0 ]
220 do
221 i=$((i-1))
222 kill ${pid[$i]}
223 sleep 2
224 done
225
226 # Kill the parent id
227 kill $PID
228 fi
196 229
197 # Kill the parent id 230 else
198 kill $PID 231 # Kill these children pids from the last one
232 while [ $i -ne 0 ]
233 do
234 i=$((i-1))
235 kill ${pid[$i]}
236 sleep 2
237 done
238
239 # Kill the parent id
240 kill $PID
241 fi
199 fi 242 fi
200 243
201 return 244 return
@@ -209,7 +252,7 @@ Test_Check_Qemu_UP()
209 Test_Info "There is no Qemu process" 252 Test_Info "There is no Qemu process"
210 return 1 253 return 1
211 else 254 else
212 Test_Info "There is at least Qemu process running" 255 Test_Info "There is at least one Qemu process running"
213 return 0 256 return 0
214 fi 257 fi
215} 258}
@@ -384,31 +427,29 @@ Test_Create_Qemu()
384 427
385 CP=`which cp` 428 CP=`which cp`
386 429
387 # When SHARE_IMAGE is set, we use the existing image under tmp folder 430 # When TEST_SERIALIZE is set, we use the existing image under tmp folder
388 if [ -e "$TEST_ROOTFS_IMAGE" ]; then 431 if [ ${TEST_SERIALIZE} -eq 1 -a -e "$TARGET_IPSAVE" ]; then
389 if [ ${SHARE_IMAGE} -eq 1 ]; then 432 # If TARGET_IPSAVE exists, check PID of the qemu process from it
390 ROOTFS_IMAGE="$TEST_ROOTFS_IMAGE" 433 PID=`awk '{print $1}' $TARGET_IPSAVE`
391 TEST_ROOTFS_IMAGE="${TEST_TMP}/${QEMUTARGET}-${QEMUARCH}-shared-test.ext3" 434 timeout=50
392 fi 435 else
393 rm -rf $TEST_ROOTFS_IMAGE 436 rm -rf $TEST_ROOTFS_IMAGE
394 fi 437 $CP $ROOTFS_IMAGE $TEST_ROOTFS_IMAGE
438 if [ $? -ne 0 ]; then
439 Test_Info "Image ${ROOTFS_IMAGE} copy to ${TEST_ROOTFS_IMAGE} failed, return fail"
440 return $ret
441 fi
395 442
396 $CP $ROOTFS_IMAGE $TEST_ROOTFS_IMAGE 443 export MACHINE=$QEMUARCH
397 444
398 if [ $? -ne 0 ]; then 445 # Create Qemu in localhost VNC Port 1
399 Test_Info "Image ${ROOTFS_IMAGE} copy to ${TEST_ROOTFS_IMAGE} failed, return fail" 446 echo "Running xterm -display ${DISPLAY} -e 'BUILDDIR=${TOPDIR} ${RUNQEMU} ${KERNEL} ${TEST_ROOTFS_IMAGE}' &"
400 return $ret 447 xterm -display ${DISPLAY} -e "BUILDDIR=${TOPDIR} ${RUNQEMU} ${KERNEL} ${TEST_ROOTFS_IMAGE}" &
448
449 # Get the pid of the xterm processor, which will be used in Test_Kill_Qemu
450 PID=$!
401 fi 451 fi
402 452
403 export MACHINE=$QEMUARCH
404
405 # Create Qemu in localhost VNC Port 1
406 echo "Running xterm -display ${DISPLAY} -e 'BUILDDIR=${TOPDIR} ${RUNQEMU} ${KERNEL} ${TEST_ROOTFS_IMAGE}' &"
407 xterm -display ${DISPLAY} -e "BUILDDIR=${TOPDIR} ${RUNQEMU} ${KERNEL} ${TEST_ROOTFS_IMAGE}" &
408
409 # Get the pid of the xterm processor, which will be used in Test_Kill_Qemu
410 PID=$!
411
412 while [ ${up_time} -lt 10 ] 453 while [ ${up_time} -lt 10 ]
413 do 454 do
414 Test_Check_Qemu_UP 455 Test_Check_Qemu_UP
@@ -437,7 +478,7 @@ Test_Create_Qemu()
437 do 478 do
438 Test_Check_IP_UP ${TARGET_IPADDR} 479 Test_Check_IP_UP ${TARGET_IPADDR}
439 if [ $? -eq 0 ]; then 480 if [ $? -eq 0 ]; then
440 Test_Info "Qemu Network is up, ping with ${TARGET_IPADDR} is OK" 481 Test_Info "Qemu Network is up, ping with ${TARGET_IPADDR} is OK within ${up_time} seconds"
441 ret=0 482 ret=0
442 break 483 break
443 else 484 else
@@ -451,7 +492,8 @@ Test_Create_Qemu()
451 Test_Info "Qemu and its network is up" 492 Test_Info "Qemu and its network is up"
452 return $ret 493 return $ret
453 else 494 else
454 Test_Info "Qemu or its network is not up in ${timeout}" 495 Test_Info "Qemu or its network is not up in ${timeout} seconds"
496 Test_Update_IPSAVE $PID $TARGET_IPADDR
455 return $ret 497 return $ret
456 fi 498 fi
457} 499}
diff --git a/scripts/qemuimage-tests/sanity/compiler b/scripts/qemuimage-tests/sanity/compiler
index d3168a973c..29dbfd9bb9 100755
--- a/scripts/qemuimage-tests/sanity/compiler
+++ b/scripts/qemuimage-tests/sanity/compiler
@@ -11,7 +11,7 @@
11 11
12. $POKYBASE/scripts/qemuimage-testlib 12. $POKYBASE/scripts/qemuimage-testlib
13 13
14TIMEOUT=200 14TIMEOUT=400
15RET=1 15RET=1
16 16
17# Start qemu and check its network 17# Start qemu and check its network
diff --git a/scripts/qemuimage-tests/sanity/connman b/scripts/qemuimage-tests/sanity/connman
index 6e19b81b16..fca6a27845 100755
--- a/scripts/qemuimage-tests/sanity/connman
+++ b/scripts/qemuimage-tests/sanity/connman
@@ -11,7 +11,7 @@
11 11
12. $POKYBASE/scripts/qemuimage-testlib 12. $POKYBASE/scripts/qemuimage-testlib
13 13
14TIMEOUT=200 14TIMEOUT=400
15RET=1 15RET=1
16 16
17# Start qemu and check its network 17# Start qemu and check its network
diff --git a/scripts/qemuimage-tests/sanity/dmesg b/scripts/qemuimage-tests/sanity/dmesg
index d98d7aff84..5ed31b735f 100755
--- a/scripts/qemuimage-tests/sanity/dmesg
+++ b/scripts/qemuimage-tests/sanity/dmesg
@@ -11,7 +11,7 @@
11 11
12. $POKYBASE/scripts/qemuimage-testlib 12. $POKYBASE/scripts/qemuimage-testlib
13 13
14TIMEOUT=200 14TIMEOUT=400
15RET=1 15RET=1
16 16
17# Start qemu and check its network 17# Start qemu and check its network
diff --git a/scripts/qemuimage-tests/sanity/rpm_query b/scripts/qemuimage-tests/sanity/rpm_query
index 7663901962..08017ffbe6 100755
--- a/scripts/qemuimage-tests/sanity/rpm_query
+++ b/scripts/qemuimage-tests/sanity/rpm_query
@@ -11,7 +11,7 @@
11 11
12. $POKYBASE/scripts/qemuimage-testlib 12. $POKYBASE/scripts/qemuimage-testlib
13 13
14TIMEOUT=200 14TIMEOUT=400
15RET=1 15RET=1
16 16
17# Start qemu and check its network 17# Start qemu and check its network
diff --git a/scripts/qemuimage-tests/sanity/scp b/scripts/qemuimage-tests/sanity/scp
index ca19857928..c72cdc9d65 100755
--- a/scripts/qemuimage-tests/sanity/scp
+++ b/scripts/qemuimage-tests/sanity/scp
@@ -11,7 +11,7 @@
11 11
12. $POKYBASE/scripts/qemuimage-testlib 12. $POKYBASE/scripts/qemuimage-testlib
13 13
14TIMEOUT=200 14TIMEOUT=400
15RET=1 15RET=1
16SPID=0 16SPID=0
17i=0 17i=0
diff --git a/scripts/qemuimage-tests/sanity/shutdown b/scripts/qemuimage-tests/sanity/shutdown
index dde03c9a10..bc08cf0fdc 100755
--- a/scripts/qemuimage-tests/sanity/shutdown
+++ b/scripts/qemuimage-tests/sanity/shutdown
@@ -13,11 +13,7 @@
13 13
14. $POKYBASE/scripts/qemuimage-testlib 14. $POKYBASE/scripts/qemuimage-testlib
15 15
16if [ $SHARE_IMAGE -eq 0 ]; then 16TIMEOUT=400
17 TIMEOUT=200
18elif [ $SHARE_IMAGE -eq 1 ]; then
19 TIMEOUT=500
20fi
21 17
22RET=1 18RET=1
23i=0 19i=0
@@ -66,6 +62,11 @@ fi
66if [ ${RET} -eq 0 ]; then 62if [ ${RET} -eq 0 ]; then
67 Test_Info "Shutdown Test PASS" 63 Test_Info "Shutdown Test PASS"
68 Test_Print_Result "shutdown" 0 64 Test_Print_Result "shutdown" 0
65
66 # Remove TARGET_IPSAVE since no existing qemu running now
67 if [ -e ${TARGET_IPSAVE} ]; then
68 rm -rf ${TARGET_IPSAVE}
69 fi
69 exit 0 70 exit 0
70else 71else
71 Test_Info "Shutdown Test FAIL" 72 Test_Info "Shutdown Test FAIL"
diff --git a/scripts/qemuimage-tests/sanity/ssh b/scripts/qemuimage-tests/sanity/ssh
index e0ade72ca3..2a0e934392 100755
--- a/scripts/qemuimage-tests/sanity/ssh
+++ b/scripts/qemuimage-tests/sanity/ssh
@@ -11,7 +11,7 @@
11 11
12. $POKYBASE/scripts/qemuimage-testlib 12. $POKYBASE/scripts/qemuimage-testlib
13 13
14TIMEOUT=200 14TIMEOUT=400
15RET=1 15RET=1
16 16
17# Start qemu and check its network 17# Start qemu and check its network
diff --git a/scripts/qemuimage-tests/sanity/zypper_help b/scripts/qemuimage-tests/sanity/zypper_help
index 48e121c9e1..1ab6d2407f 100755
--- a/scripts/qemuimage-tests/sanity/zypper_help
+++ b/scripts/qemuimage-tests/sanity/zypper_help
@@ -11,7 +11,7 @@
11 11
12. $POKYBASE/scripts/qemuimage-testlib 12. $POKYBASE/scripts/qemuimage-testlib
13 13
14TIMEOUT=200 14TIMEOUT=400
15RET=1 15RET=1
16 16
17# Start qemu and check its network 17# Start qemu and check its network
diff --git a/scripts/qemuimage-tests/sanity/zypper_search b/scripts/qemuimage-tests/sanity/zypper_search
index 9ae69ebf1f..d6bcd27a34 100755
--- a/scripts/qemuimage-tests/sanity/zypper_search
+++ b/scripts/qemuimage-tests/sanity/zypper_search
@@ -11,7 +11,7 @@
11 11
12. $POKYBASE/scripts/qemuimage-testlib 12. $POKYBASE/scripts/qemuimage-testlib
13 13
14TIMEOUT=200 14TIMEOUT=400
15RET=1 15RET=1
16 16
17# Start qemu and check its network 17# Start qemu and check its network
diff --git a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb
index 0eb1926cfd..4fa6068768 100644
--- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-lsb
@@ -1,8 +1,7 @@
1sanity shutdown
2sanity boot
3sanity ssh 1sanity ssh
4sanity scp 2sanity scp
5sanity dmesg 3sanity dmesg
6sanity zypper_help 4sanity zypper_help
7sanity zypper_search 5sanity zypper_search
8sanity rpm_query 6sanity rpm_query
7sanity shutdown
diff --git a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato
index b60a89af51..7a6353e1af 100644
--- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sato
@@ -1,5 +1,3 @@
1sanity shutdown
2sanity boot
3sanity ssh 1sanity ssh
4sanity scp 2sanity scp
5sanity dmesg 3sanity dmesg
@@ -7,3 +5,4 @@ sanity zypper_help
7sanity zypper_search 5sanity zypper_search
8sanity rpm_query 6sanity rpm_query
9sanity connman 7sanity connman
8sanity shutdown
diff --git a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk
index 53c9ad591e..42b8e19026 100644
--- a/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk
+++ b/scripts/qemuimage-tests/scenario/qemuarm/poky-image-sdk
@@ -1,5 +1,3 @@
1sanity shutdown
2sanity boot
3sanity ssh 1sanity ssh
4sanity scp 2sanity scp
5sanity dmesg 3sanity dmesg
@@ -8,3 +6,4 @@ sanity zypper_search
8sanity rpm_query 6sanity rpm_query
9sanity compiler 7sanity compiler
10sanity connman 8sanity connman
9sanity shutdown
diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb
index 0eb1926cfd..4fa6068768 100644
--- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemumips/poky-image-lsb
@@ -1,8 +1,7 @@
1sanity shutdown
2sanity boot
3sanity ssh 1sanity ssh
4sanity scp 2sanity scp
5sanity dmesg 3sanity dmesg
6sanity zypper_help 4sanity zypper_help
7sanity zypper_search 5sanity zypper_search
8sanity rpm_query 6sanity rpm_query
7sanity shutdown
diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato b/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato
index b60a89af51..7a6353e1af 100644
--- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemumips/poky-image-sato
@@ -1,5 +1,3 @@
1sanity shutdown
2sanity boot
3sanity ssh 1sanity ssh
4sanity scp 2sanity scp
5sanity dmesg 3sanity dmesg
@@ -7,3 +5,4 @@ sanity zypper_help
7sanity zypper_search 5sanity zypper_search
8sanity rpm_query 6sanity rpm_query
9sanity connman 7sanity connman
8sanity shutdown
diff --git a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk
index 53c9ad591e..42b8e19026 100644
--- a/scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk
+++ b/scripts/qemuimage-tests/scenario/qemumips/poky-image-sdk
@@ -1,5 +1,3 @@
1sanity shutdown
2sanity boot
3sanity ssh 1sanity ssh
4sanity scp 2sanity scp
5sanity dmesg 3sanity dmesg
@@ -8,3 +6,4 @@ sanity zypper_search
8sanity rpm_query 6sanity rpm_query
9sanity compiler 7sanity compiler
10sanity connman 8sanity connman
9sanity shutdown
diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb
index 0eb1926cfd..4fa6068768 100644
--- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-lsb
@@ -1,8 +1,7 @@
1sanity shutdown
2sanity boot
3sanity ssh 1sanity ssh
4sanity scp 2sanity scp
5sanity dmesg 3sanity dmesg
6sanity zypper_help 4sanity zypper_help
7sanity zypper_search 5sanity zypper_search
8sanity rpm_query 6sanity rpm_query
7sanity shutdown
diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato
index b60a89af51..7a6353e1af 100644
--- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sato
@@ -1,5 +1,3 @@
1sanity shutdown
2sanity boot
3sanity ssh 1sanity ssh
4sanity scp 2sanity scp
5sanity dmesg 3sanity dmesg
@@ -7,3 +5,4 @@ sanity zypper_help
7sanity zypper_search 5sanity zypper_search
8sanity rpm_query 6sanity rpm_query
9sanity connman 7sanity connman
8sanity shutdown
diff --git a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk
index 53c9ad591e..42b8e19026 100644
--- a/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk
+++ b/scripts/qemuimage-tests/scenario/qemuppc/poky-image-sdk
@@ -1,5 +1,3 @@
1sanity shutdown
2sanity boot
3sanity ssh 1sanity ssh
4sanity scp 2sanity scp
5sanity dmesg 3sanity dmesg
@@ -8,3 +6,4 @@ sanity zypper_search
8sanity rpm_query 6sanity rpm_query
9sanity compiler 7sanity compiler
10sanity connman 8sanity connman
9sanity shutdown
diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb
index 0eb1926cfd..4fa6068768 100644
--- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-lsb
@@ -1,8 +1,7 @@
1sanity shutdown
2sanity boot
3sanity ssh 1sanity ssh
4sanity scp 2sanity scp
5sanity dmesg 3sanity dmesg
6sanity zypper_help 4sanity zypper_help
7sanity zypper_search 5sanity zypper_search
8sanity rpm_query 6sanity rpm_query
7sanity shutdown
diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato
index b60a89af51..7a6353e1af 100644
--- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sato
@@ -1,5 +1,3 @@
1sanity shutdown
2sanity boot
3sanity ssh 1sanity ssh
4sanity scp 2sanity scp
5sanity dmesg 3sanity dmesg
@@ -7,3 +5,4 @@ sanity zypper_help
7sanity zypper_search 5sanity zypper_search
8sanity rpm_query 6sanity rpm_query
9sanity connman 7sanity connman
8sanity shutdown
diff --git a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sdk
index 53c9ad591e..42b8e19026 100644
--- a/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sdk
+++ b/scripts/qemuimage-tests/scenario/qemux86-64/poky-image-sdk
@@ -1,5 +1,3 @@
1sanity shutdown
2sanity boot
3sanity ssh 1sanity ssh
4sanity scp 2sanity scp
5sanity dmesg 3sanity dmesg
@@ -8,3 +6,4 @@ sanity zypper_search
8sanity rpm_query 6sanity rpm_query
9sanity compiler 7sanity compiler
10sanity connman 8sanity connman
9sanity shutdown
diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb b/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb
index 0eb1926cfd..4fa6068768 100644
--- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb
+++ b/scripts/qemuimage-tests/scenario/qemux86/poky-image-lsb
@@ -1,8 +1,7 @@
1sanity shutdown
2sanity boot
3sanity ssh 1sanity ssh
4sanity scp 2sanity scp
5sanity dmesg 3sanity dmesg
6sanity zypper_help 4sanity zypper_help
7sanity zypper_search 5sanity zypper_search
8sanity rpm_query 6sanity rpm_query
7sanity shutdown
diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato b/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato
index b60a89af51..7a6353e1af 100644
--- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato
+++ b/scripts/qemuimage-tests/scenario/qemux86/poky-image-sato
@@ -1,5 +1,3 @@
1sanity shutdown
2sanity boot
3sanity ssh 1sanity ssh
4sanity scp 2sanity scp
5sanity dmesg 3sanity dmesg
@@ -7,3 +5,4 @@ sanity zypper_help
7sanity zypper_search 5sanity zypper_search
8sanity rpm_query 6sanity rpm_query
9sanity connman 7sanity connman
8sanity shutdown
diff --git a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk b/scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk
index 53c9ad591e..42b8e19026 100644
--- a/scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk
+++ b/scripts/qemuimage-tests/scenario/qemux86/poky-image-sdk
@@ -1,5 +1,3 @@
1sanity shutdown
2sanity boot
3sanity ssh 1sanity ssh
4sanity scp 2sanity scp
5sanity dmesg 3sanity dmesg
@@ -8,3 +6,4 @@ sanity zypper_search
8sanity rpm_query 6sanity rpm_query
9sanity compiler 7sanity compiler
10sanity connman 8sanity connman
9sanity shutdown