Remove the rw folder from the image after installing in KVM

check_install.py

@@ -37,22 +37,19 @@ def main():
                 raise
             time.sleep(1)
 
-    # select ONIE embed
+    # select default SONiC Image
     p.expect(grub_selection)
-    p.sendline(KEY_DOWN)
+    p.sendline()
 
-    # install sonic image
+    # bootup sonic image
     while True:
-        i = p.expect([login_prompt, passwd_prompt, grub_selection, cmd_prompt])
+        i = p.expect([login_prompt, passwd_prompt, cmd_prompt])
         if i == 0:
             # send user name
             p.sendline(args.u)
         elif i == 1:
             # send password
             p.sendline(args.P)
-        elif i == 2:
-            # select onie install
-            p.sendline()
         else:
             break
 
@@ -64,6 +61,8 @@ def main():
     p.expect([cmd_prompt])
     p.sendline('show ip bgp sum')
     p.expect([cmd_prompt])
+    p.sendline('sudo rm -r /host/image-*/rw/')
+    p.expect([cmd_prompt])
     p.sendline('sync')
     p.expect([cmd_prompt])
 

install_sonic.py

@@ -0,0 +1,49 @@
+#!/usr/bin/env python3
+
+import argparse
+import pexpect
+import sys
+import time
+
+
+def main():
+
+    parser = argparse.ArgumentParser(description='test_login cmdline parser')
+    parser.add_argument('-p', type=int, default=9000, help='local port')
+
+    args = parser.parse_args()
+
+    KEY_UP = '\x1b[A'
+    KEY_DOWN = '\x1b[B'
+    KEY_RIGHT = '\x1b[C'
+    KEY_LEFT = '\x1b[D'
+
+    grub_selection = "The highlighted entry will be executed"
+
+    i = 0
+    while True:
+        try:
+            p = pexpect.spawn("telnet 127.0.0.1 {}".format(args.p), timeout=600, logfile=sys.stdout, encoding='utf-8')
+            break
+        except Exception as e:
+            print(str(e))
+            i += 1
+            if i == 10:
+                raise
+            time.sleep(1)
+
+    # select ONIE embed
+    p.expect(grub_selection)
+    p.sendline(KEY_DOWN)
+
+    # select ONIE install
+    p.expect(['ONIE: Install OS'])
+    p.expect([grub_selection])
+    p.sendline()
+
+    # wait for grub, and exit
+    p.expect([grub_selection])
+
+
+if __name__ == '__main__':
+    main()

scripts/build_kvm_image.sh

@@ -67,6 +67,8 @@ kvm_log=$(mktemp)
 trap on_exit EXIT
 trap on_error ERR
 
+echo "Installing SONiC"
+
 /usr/bin/kvm -m $MEM \
     -name "onie" \
     -boot "order=cd,once=d" -cdrom "$ONIE_RECOVERY_ISO" \
@@ -90,6 +92,34 @@ sleep 2.0
 
 echo "to kill kvm:  sudo kill $kvm_pid"
 
+./install_sonic.py
+
+kill $kvm_pid
+
+echo "Booting up SONiC"
+
+/usr/bin/kvm -m $MEM \
+    -name "onie" \
+    -device e1000,netdev=onienet \
+    -netdev user,id=onienet,hostfwd=:0.0.0.0:3041-:22 \
+    -vnc 0.0.0.0:0 \
+    -vga std \
+    -snapshot \
+    -drive file=$DISK,media=disk,if=virtio,index=0 \
+    -serial telnet:127.0.0.1:$KVM_PORT,server > $kvm_log 2>&1 &
+
+kvm_pid=$!
+
+sleep 2.0
+
+[ -d "/proc/$kvm_pid" ] || {
+        echo "ERROR: kvm died."
+        cat $kvm_log
+        exit 1
+}
+
+echo "to kill kvm:  sudo kill $kvm_pid"
+
 ./check_install.py -u $SONIC_USERNAME -P $PASSWD -p $KVM_PORT
 
 kill $kvm_pid