diff options
| author | Petter Reinholdtsen <pere@hungry.com> | 2012-12-05 21:29:14 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2012-12-05 23:36:16 +0100 |
| commit | fc80303c88e7bec85ebd8cf4389ed69cf694fede (patch) | |
| tree | 49a6487e07ca5f23553fd0bc4fb2379341482fea | |
| parent | 25c046abb3898aca38ea7ec8890942eb1516988b (diff) | |
| download | jenkins.debian.net-fc80303c88e7bec85ebd8cf4389ed69cf694fede.tar.xz | |
Make it easier to control the VNC display name by moving the complete
display name to its own variable. This make it easier to use
127.0.0.1:# instead of localhost:# on machines with IPv6/IPv4 issues.
| -rwxr-xr-x | bin/cd_tester.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/cd_tester.sh b/bin/cd_tester.sh index fc1ab1bc..ef9abcb3 100755 --- a/bin/cd_tester.sh +++ b/bin/cd_tester.sh @@ -29,7 +29,7 @@ export http_proxy="http://localhost:3128" # # init # -DISPLAY=$1 +DISPLAY=localhost:$1 NAME=$2 DISKSIZE_IN_GB=$3 URL=$4 @@ -90,7 +90,7 @@ bootstrap() { curl -s http://localhost/userContent/${NAME}-preseed.cfg | grep -v ^# |grep -v "^$" echo echo "Starting QEMU now:" - sudo qemu-system-x86_64 -cdrom $IMAGE -drive file=$NAME.raw,index=0,media=disk,cache=writeback -boot d -m 1024 -display vnc=localhost:$DISPLAY --kernel $IMAGE_MNT/install.amd/vmlinuz --append "auto=true priority=critical locale=en_US keymap=us url=http://10.0.2.2/userContent/${NAME}-preseed.cfg video=vesa:ywrap,mtrr vga=788 initrd=/install.amd/gtk/initrd.gz -- quiet" --initrd $IMAGE_MNT/install.amd/gtk/initrd.gz & + sudo qemu-system-x86_64 -cdrom $IMAGE -drive file=$NAME.raw,index=0,media=disk,cache=writeback -boot d -m 1024 -display vnc=$DISPLAY --kernel $IMAGE_MNT/install.amd/vmlinuz --append "auto=true priority=critical locale=en_US keymap=us url=http://10.0.2.2/userContent/${NAME}-preseed.cfg video=vesa:ywrap,mtrr vga=788 initrd=/install.amd/gtk/initrd.gz -- quiet" --initrd $IMAGE_MNT/install.amd/gtk/initrd.gz & ;; squeeze-test-debian-edu-standalone) echo "Preseeding used:" @@ -98,7 +98,7 @@ bootstrap() { curl -s http://localhost/userContent/${NAME}-preseed.cfg | grep -v ^# |grep -v "^$" echo echo "Starting QEMU now:" - sudo qemu-system-x86_64 -cdrom $IMAGE -drive file=$NAME.raw,index=0,media=disk,cache=writeback -boot d -m 1024 -display vnc=localhost:$DISPLAY --kernel $IMAGE_MNT/install.amd/vmlinuz --append "auto=true priority=critical locale=en_US console-keymaps-at/keymap=us url=http://10.0.2.2/userContent/${NAME}-preseed.cfg video=vesa:ywrap,mtrr vga=788 initrd=/install.amd/gtk/initrd.gz -- quiet" --initrd $IMAGE_MNT/install.amd/gtk/initrd.gz & + sudo qemu-system-x86_64 -cdrom $IMAGE -drive file=$NAME.raw,index=0,media=disk,cache=writeback -boot d -m 1024 -display vnc=$DISPLAY --kernel $IMAGE_MNT/install.amd/vmlinuz --append "auto=true priority=critical locale=en_US console-keymaps-at/keymap=us url=http://10.0.2.2/userContent/${NAME}-preseed.cfg video=vesa:ywrap,mtrr vga=788 initrd=/install.amd/gtk/initrd.gz -- quiet" --initrd $IMAGE_MNT/install.amd/gtk/initrd.gz & ;; wheezy-lxde) echo "Preseeding used:" @@ -106,7 +106,7 @@ bootstrap() { curl -s http://localhost/userContent/${NAME}-preseed.cfg | grep -v ^# |grep -v "^$" echo echo "Starting QEMU now:" - sudo qemu-system-x86_64 -drive file=$NAME.raw,index=0,media=disk,cache=writeback -boot c -m 1024 -display vnc=localhost:$DISPLAY --kernel $KERNEL --append "auto=true priority=critical desktop=lxde locale=en_US keymap=us url=http://10.0.2.2/userContent/${NAME}-preseed.cfg video=vesa:ywrap,mtrr vga=788 --" --initrd $INITRD & + sudo qemu-system-x86_64 -drive file=$NAME.raw,index=0,media=disk,cache=writeback -boot c -m 1024 -display vnc=$DISPLAY --kernel $KERNEL --append "auto=true priority=critical desktop=lxde locale=en_US keymap=us url=http://10.0.2.2/userContent/${NAME}-preseed.cfg video=vesa:ywrap,mtrr vga=788 --" --initrd $INITRD & ;; *) echo "unsupported distro." exit 1 @@ -129,7 +129,7 @@ monitor_installation() { if [ $(ps fax | grep -v grep | grep qemu-system | grep ${NAME}-preseed.cfg 2>/dev/null | wc -l) -eq 0 ] ; then break fi - vncsnapshot -quiet -allowblank localhost:$DISPLAY snapshot_$(printf "%06d" $NR).jpg 2>/dev/null + vncsnapshot -quiet -allowblank $DISPLAY snapshot_$(printf "%06d" $NR).jpg 2>/dev/null convert snapshot_$(printf "%06d" $NR).jpg snapshot_$(printf "%06d" $NR).ppm rm snapshot_$(printf "%06d" $NR).jpg # give signal we are still running @@ -138,7 +138,7 @@ monitor_installation() { fi # press ctrl-key to avoid screensaver kicking in if [ $(($NR % 150)) -eq 0 ] ; then - vncdo -s localhost:$DISPLAY key ctrl + vncdo -s $DISPLAY key ctrl fi # if this screenshot is the same as the one 400 screenshots ago, let stop this if [ $(($NR % 100)) -eq 0 ] && [ $NR -gt 400 ] ; then |