[28442] in Source-Commits
scripts commit: Switch to qemu from vmware; enhance tests
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Sep 24 16:47:05 2014
Date: Wed, 24 Sep 2014 16:46:58 -0400
From: Jonathan D Reed <jdreed@mit.edu>
Message-Id: <201409242046.s8OKkwvr014047@drugstore.mit.edu>
To: source-commits@mit.edu
https://github.com/mit-athena/scripts/commit/6562e4316bcfb22c5a18a1684e002030ed4e7183
commit 6562e4316bcfb22c5a18a1684e002030ed4e7183
Author: Jonathan Reed <jdreed@mit.edu>
Date: Tue Sep 23 09:42:14 2014 -0400
Switch to qemu from vmware; enhance tests
- VMware didn't do as well headless as I would have liked, and ESX
was a bit too large of a hammer, so we switch to QEMU.
- Change the logic to simply bootstrap the stage2 installer rather
then writing out our own preseed.
- Log to a uniquely generated log file
- Break testing out into 3 stages (networking, installer,
final working machine).
tests/installer/install-test.sh | 284 ++++++++++++--------
tests/installer/isolinux/isolinux.cfg | 8 -
.../installer/preseed/example-preseed.autoinstall | 249 -----------------
tests/installer/vmware_config/default.nvram | Bin 8684 -> 0 bytes
tests/installer/vmware_config/default.vmdk | Bin 2686976 -> 0 bytes
tests/installer/vmware_config/default.vmx | 87 ------
tests/installer/vmware_config/default.vmxf | 8 -
7 files changed, 177 insertions(+), 459 deletions(-)
diff --git a/tests/installer/install-test.sh b/tests/installer/install-test.sh
index 335945c..7a7eb78 100755
--- a/tests/installer/install-test.sh
+++ b/tests/installer/install-test.sh
@@ -1,153 +1,223 @@
#!/bin/bash
-# install debathena into a blank vm, and run tests confirming the install
-#
-#
-# This was developed and tested using VMWare Workstation 9,
-# and mkisofs(2.01)/genisoimage 1.1.11
+# Automated testing of Debathena installs
#
# example usage:
# -s precise
# -a i386
# -h <vmware host>
-# -i (this was tested using a static IP taken from vmnet8)
-# -p http://<your preseed>
-
-BASEDIR=.
+# -b
+# (use beta installer)
-SUITE=
-ARCH=
-IP=
+# Defaults
+SUITE=trusty
+ARCH=amd64
HOSTNAME=
-PRESEED=
+INSTALLERTYPE=production
+ISOLINUXBIN=/usr/lib/syslinux/isolinux.bin
+SCRATCH=/var/vm_scratch
+LOGFILE=""
-LOGDIR=$BASEDIR/log
-NOW=$(date +"%d-%m-%y")
-LOG=$LOGDIR/"install-test-"$NOW".log"
+die() {
+ echo "$@" >&2
+ exit 1
+}
-function usage() {
- cat<< EO
- Usage: -s <suite> -a <architecture> -h <hostname> -i <ip> -p <preseed>
-EO
+stop_qemu() {
+ PID=
+ if [ -n "$QPIDFILE" ] && \
+ [ -r "$QPIDFILE" ]; then
+ PID="$(cat $QPIDFILE)"
+ else
+ echo "QEMU PID file ($QPIDFILE) missing or unreadable" >&2
+ return 0
+ fi
+ if ! echo quit | nc localhost 4444; then
+ echo "Couldn't send quit command to monitor! Trying to kill.." >&2
+ kill "$PID" || :
+ fi
+ sleep 1
+ if kill -0 "$PID" 2>/dev/null; then
+ echo "Uh oh, QEMU is still running. You're on your own." >&2
+ fi
}
+cleanup() {
+ rv=$?
+ stop_qemu
+ if [ -n "$TMPDIR" ]; then
+ if [ $rv -ne 0 ]; then
+ echo "Not cleaning up -- investigate remnants in $TMPDIR"
+ else
+ rm -rf "$TMPDIR"
+ fi
+ fi
+ exit $rv
+}
-while getopts "s:a:h:i:p:" OPTION
+write_isolinuxcfg() {
+ [ -n "$NETCFG" ] && [ -n "$SUITE" ] && [ -n "$INSTALLERTYPE" ]
+ cat <<EOF > "$1"
+label linux
+ kernel ../linux
+ append initrd=../initrd.gz $NETCFG locale=en_US keyboard-configuration/layoutcode=us interface=auto url=http://18.9.60.73/installer/$SUITE/debathena.preseed da/pxe=cluster da/i=$INSTALLERTYPE
+
+DEFAULT linux
+PROMPT 0
+TIMEOUT 0
+EOF
+}
-do
+while getopts "l:bs:a:h:" OPTION; do
case $OPTION in
+ l)
+ LOGFILE=$OPTARG
+ ;;
s)
SUITE=$OPTARG
;;
+ b)
+ INSTALLERTYPE=beta
+ ;;
a)
ARCH=$OPTARG
;;
h)
HOSTNAME=$OPTARG
;;
- i)
- IP=$OPTARG
- ;;
- p)
- PRESEED=$OPTARG
- ;;
?)
- usage
- exit 1
- ;;
+ echo "Usage: $0 -b -s <suite> -a <architecture> -h <hostname>" >&2
+ exit 1
+ ;;
esac
done
-if [[ -z $HOSTNAME || -z $ARCH || -z $PRESEED || -z $IP ]] ; then
- echo "Empty option. HOSTNAME: $HOSTNAME, ARCH: $ARCH, PRESEED: $PRESEED, IP: $IP" | tee -a $LOG
- usage
- exit 1
-fi
-
-if [ -d tmp ] ; then
- rm -rf tmp
+[ -n "$HOSTNAME" ] || die "HOSTNAME unspecified"
+case "$ARCH" in
+ i386|amd64)
+ ;;
+ *)
+ die "Unknown arch $ARCH"
+ ;;
+esac
+[ -n "$SUITE" ] || die "SUITE unspecified"
+[ -f "$ISOLINUXBIN" ] || die "$ISOLINUXBIN missing"
+
+if [ -n "$LOGFILE" ]; then
+ if ! [ -d "$(dirname "$LOGFILE")" ]; then
+ echo "Logfile directory does not exist" >&2
+ exit 1
+ fi
+ if [ -e "$LOGFILE" ]; then
+ echo "$LOGFILE exists, remove it." >&2
+ fi
+ if ! touch "$LOGFILE"; then
+ echo "Could not create logfile $LOGFILE." >&2
+ exit 1
+ fi
+ # Close stdin
+ exec < /dev/null
+
+ # Save reference to stdout
+ exec 3>&1
+
+ # All output now goes to a log file
+ exec >> "$LOGFILE" 2>&1
fi
-mkdir $BASEDIR/tmp
-mkdir $BASEDIR/tmp/isolinux
-TMPDIR=$BASEDIR/tmp
+trap cleanup EXIT
+set -ex
+TMPDIR=$(mktemp -d --tmpdir="$SCRATCH")
-echo "creating build files..." | tee -a $LOG
-
-ISOLINUXBIN=/usr/lib/syslinux/isolinux.bin
-
-if [ ! -f $ISOLINUXBIN ] ; then
- echo "isolinux.bin not found at: $ISOLINUXBIN exiting..." | tee -a $LOG
- exit 1
-fi
-
-cp $ISOLINUXBIN $TMPDIR/isolinux
-
-if [ ! -f $BASEDIR/isolinux/isolinux.cfg ] ; then
- echo "isolinux.cfg not found. exiting..." | tee -a $LOG
- exit 1
+echo -n "Looking up $HOSTNAME ... "
+# This will always return true because of tail(1)
+IP=$(dig +short $HOSTNAME | tail -1)
+if echo "$IP" | grep -q '[^0-9\.]'; then
+ echo "bad IP ($IP)."
+ exit 1
+else
+ echo "$IP"
fi
-cp -R $BASEDIR/isolinux $TMPDIR
-
-ISOLINUXCFG=$TMPDIR/isolinux/isolinux.cfg
+# Ewww, replace this with netparams ASAP
+# and/or add sanity checking to ensure it's on the bridged network
+GATEWAY=$(echo "$IP" | awk -F. '{print $1"."$2".0.1"}')
-echo "seeding isolinux.cfg..." | tee -a $LOG
+NETCFG="netcfg/disable_autoconfig=true netcfg/get_domain=mit.edu netcfg/get_hostname=$HOSTNAME netcfg/get_nameservers=\"18.72.0.3 18.70.0.160 18.71.0.151\" netcfg/get_ipaddress=$IP netcfg/get_gateway=$GATEWAY netcfg/get_netmask=255.255.0.0 netcfg/confirm_static=true"
-sed -i "s|%HOSTNAME%|$HOSTNAME|g" $ISOLINUXCFG
-sed -i "s|%IP%|$IP|g" $ISOLINUXCFG
-sed -i "s|%PRESEED%|$PRESEED|g" $ISOLINUXCFG
+ISOROOT="$TMPDIR/iso"
+mkdir -p "$ISOROOT/isolinux"
+echo "Preparing ISO image..."
+cp -v "$ISOLINUXBIN" "$ISOROOT/isolinux"
+write_isolinuxcfg "$ISOROOT/isolinux/isolinux.cfg"
-echo "fetching kernel and initrd..." | tee -a $LOG
-wget -q http://mirrors.mit.edu/ubuntu/dists/$SUITE/main/installer-$ARCH/current/images/netboot/ubuntu-installer/$ARCH/linux -O $TMPDIR/linux
-wget -q http://mirrors.mit.edu/ubuntu/dists/$SUITE/main/installer-$ARCH/current/images/netboot/ubuntu-installer/$ARCH/initrd.gz -O $TMPDIR/initrd.gz
-
-echo "creating iso image..." | tee -a $LOG
-
-IMAGENAME=$SUITE-$ARCH-netboot.iso
+echo "Downloading kernel..."
+wget -q http://mirrors.mit.edu/ubuntu/dists/$SUITE/main/installer-$ARCH/current/images/netboot/ubuntu-installer/$ARCH/linux -O $ISOROOT/linux
+echo "Downloading initrd..."
+wget -q http://mirrors.mit.edu/ubuntu/dists/$SUITE/main/installer-$ARCH/current/images/netboot/ubuntu-installer/$ARCH/initrd.gz -O $ISOROOT/initrd.gz
+IMAGENAME="$SUITE-$ARCH-netboot.iso"
+echo "Creating ISO image..."
mkisofs -r -V "Debathena Boot" \
-cache-inodes \
-J -l -b isolinux/isolinux.bin \
-c isolinux/boot.cat -no-emul-boot \
-boot-load-size 4 -boot-info-table \
- -o $IMAGENAME $TMPDIR 2>&1 | tee -a $LOG
-
-if [ ! -f $BASEDIR/$IMAGENAME ] ; then
- echo "iso creation failed. exiting..." | tee -a $LOG
-else
- echo "iso creation success..." | tee -a $LOG
-fi
-
-echo "installing iso into VM image..." | tee -a $LOG
-
-VMWARE_CONFIG=$BASEDIR/vmware_config
-
-#make vmwware boot out virtual disk / iso
-mkdir $TMPDIR/vm
-cp -R $VMWARE_CONFIG/* $TMPDIR/vm
-mv $BASEDIR/$IMAGENAME $TMPDIR/vm
-
-sed -i "s|%ISO%|$IMAGENAME|g" $TMPDIR/vm/default.vmx
-
-vmrun start $TMPDIR/vm/default.vmx 2>&1 | tee -a $LOG
-
-echo "sleeping for 4 hours before launching tests..." | tee -a $LOG
-
-sleep 240m
-
-ATHINFO_VERSION_PASS=`athinfo $HOSTNAME version | grep -c debathena-cluster`
-
-#TODO: get more useful reporting here. The last messages weren't quite working as expected
-if [[ $ATHINFO_VERSION_PASS -ne 1 ]] ; then
- echo "Test Failed." | tee -a $LOG
-else
- echo "Test Passed." | tee -a $LOG
+ -o "$TMPDIR/$IMAGENAME" "$ISOROOT"
+
+[ -f "$TMPDIR/$IMAGENAME" ]
+
+echo "Preparing VM..."
+mkdir "$TMPDIR/vm"
+echo "Creating hard disk image..."
+qemu-img create -f qcow2 "$TMPDIR/vm/sda.img" 30G
+QPIDFILE="$TMPDIR/vm/qemu.pid"
+echo "Booting vm..."
+qemu-system-x86_64 -machine pc,accel=kvm -drive file="$TMPDIR/vm/sda.img",if=virtio -m 4G -netdev bridge,id=hostnet0 -device virtio-net-pci,romfile=,netdev=hostnet0 -cdrom "$TMPDIR/$IMAGENAME" -monitor tcp:localhost:4444,server,nowait -display none -daemonize -pidfile "$QPIDFILE"
+
+echo "Install started at $(date)"
+echo -n "Waiting up to 30s for machine networking to come up..."
+err=1
+for i in $(seq 30); do
+ if ping -c 1 -w 2 "$IP" > /dev/null 2>&1; then
+ err=0
+ echo "ok"
+ break
+ fi
+ echo -n "."
+ sleep 1
+done
+[ $err -eq 1 ] && die "Machine did not respond to ping within 30s"
+echo -n "Waiting up to 2m for installer athinfo..."
+err=1
+for i in $(seq 24); do
+ if athinfo -t 1 $HOSTNAME version 2>/dev/null | grep -qi installation; then
+ err=0
+ echo "ok"
+ break
+ fi
+ echo -n "."
+ sleep 5
+done
+[ $err -eq 1 ] && die "Installer athinfo not present after 2 minutes"
+echo -n "Waiting 3h for install to complete..."
+err=1
+for i in $(seq 36); do
+ if athinfo -t 1 $HOSTNAME version 2>/dev/null | grep -qi debathena-cluster; then
+ err=0
+ echo "ok"
+ break
+ fi
+ echo -n "."
+ sleep 5m
+done
+if [ $err -eq 1 ]; then
+ if ping -c 1 -w 2 "$IP" > /dev/null 2>&1; then
+ die "Install failed to complete"
+ else
+ die "Install failed and machine fell off the network!"
+ fi
fi
-
-vmrun stop $TMPDIR/vm/default.vmx 2>&1 | tee -a $LOG
-
-echo "done."
-
+echo "Install successful!"
exit 0
diff --git a/tests/installer/isolinux/isolinux.cfg b/tests/installer/isolinux/isolinux.cfg
deleted file mode 100644
index 8dc9de9..0000000
--- a/tests/installer/isolinux/isolinux.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-label linux
- kernel ../linux
- append initrd=../initrd.gz netcfg/get_hostname=%HOSTNAME% netcfg/get_ipaddress=%IP% locale=en_US keyboard-configuration/layoutcode=us interface=auto url=%PRESEED% da/pxe=cluster
-
-DEFAULT linux
-PROMPT 0
-TIMEOUT 0
diff --git a/tests/installer/preseed/example-preseed.autoinstall b/tests/installer/preseed/example-preseed.autoinstall
deleted file mode 100644
index aad3e5c..0000000
--- a/tests/installer/preseed/example-preseed.autoinstall
+++ /dev/null
@@ -1,249 +0,0 @@
-# Modified from Hardy's example-preseed.txt.
-
-# This is mildly parsed by the install script.
-
-# Locale and keyboard are set by PXELINUX via kernel options.
-
-##############################################################################
-##############################################################################
-# Stuff which looks bogus for custom installs is current split out up here
-# for later separation.
-d-i pkgsel/update-policy select none
-
-### Network configuration
-# netcfg will choose an interface that has link if possible. This makes it
-# skip displaying a list if there is more than one interface.
-d-i netcfg/choose_interface select auto
-
-##############################################################################
-##############################################################################
-
-# Any hostname and domain names assigned from dhcp take precedence over
-# values set here. However, setting the values still prevents the questions
-# from being shown, even if values come from dhcp.
-# d-i netcfg/get_hostname string unassigned-hostname
-# d-i netcfg/get_domain string unassigned-domain
-
-# Disable that annoying WEP key dialog.
-# d-i netcfg/wireless_wep string
-# The wacky dhcp hostname that some ISPs use as a password of sorts.
-# d-i netcfg/dhcp_hostname string radish
-
-### Partitioning
-# Use the whole disk. Any disk.
-# No, use the first disk (via a shell script that also does sanity checking
-#d-i partman/early_command string sh /debathena/check-disks.sh
-# We could also do this to just pick the first disk
-#d-i partman/early_command string debconf-set partman-auto/disk "$(list-devices disk | head -n1)"
-
-
-# The presently available methods are: "regular", "lvm" and "crypto"
-d-i partman-auto/method string lvm
-
-# Stomp old LVM config.
-d-i partman-auto/purge_lvm_from_device boolean true
-# Don't confirm writing LVM.
-d-i partman-lvm/confirm boolean true
-# ...and for overwriting the same thing from a previous install:
-d-i partman-lvm/device_remove_lvm boolean true
-# ...and for overwriting a completely zeroed disk:
-# This doesn't work when preseeded. It does work manually. Yay.
-# LP:154086 covers the basic problem, though not the nonpreseedability.
-# Except now it does work?
-d-i partman-lvm/confirm_nooverwrite boolean true
-
-# You can choose from any of the predefined partitioning recipes.
-# atomic: All files in one partition (recommended for new users)
-# home: Separate /home partition
-# multi: Separate /home, /usr, /var, and /tmp partitions
-# small_disk (alpha architecture only):
-# Small-disk (< 1GB) partitioning scheme
-# d-i partman-auto/choose_recipe select atomic
-
-# Or provide a recipe of your own...
-# The recipe format is documented in the file devel/partman-auto-recipe.txt.
-# If you have a way to get a recipe file into the d-i environment, you can
-# just point at it.
-d-i partman-auto/expert_recipe_file string /debathena/lvm-cluster-machine.partman
-# This is completely undocumented. Sigh.
-d-i partman-auto-lvm/new_vg_name string athena
-# As reported in Trac #253
-d-i partman-auto-lvm/guided_size string max
-# Don't punt for no-method filesystems. Another undocumented option.
-d-i partman-basicmethods/method_only boolean false
-
-# This makes partman automatically partition without confirmation, provided
-# that you told it what to do using one of the methods above.
-d-i partman/confirm_write_new_label boolean true
-d-i partman/choose_partition select finish
-d-i partman/confirm boolean true
-d-i partman/confirm_nooverwrite boolean true
-
-### Base system installation
-# Select the initramfs generator used to generate the initrd for 2.6 kernels.
-#d-i base-installer/kernel/linux/initramfs-generators string yaird
-
-# The kernel image (meta) package to be installed; "none" can be used if no
-# kernel is to be installed.
-d-i base-installer/kernel/image linux-generic
-
-### Account setup
-# No user account; root account with standard password:
-d-i passwd/make-user boolean false
-d-i passwd/root-login boolean true
-d-i passwd/root-password password profroot
-d-i passwd/root-password-again password profroot
-
-# Normal user's password, either in clear text
-#d-i passwd/user-password password insecure
-#d-i passwd/user-password-again password insecure
-# or encrypted using an MD5 hash.
-#d-i passwd/user-password-crypted password [MD5 hash]
-# Create the first user with the specified UID instead of the default.
-#d-i passwd/user-uid string 1010
-
-# The user account will be added to some standard initial groups. To
-# override that, use this.
-#d-i passwd/user-default-groups string audio cdrom video
-
-### Apt setup
-# You can choose to install restricted and universe software, or to install
-# software from the backports repository.
-d-i apt-setup/restricted boolean true
-d-i apt-setup/universe boolean true
-# Stop configuring backports (originally needed for Jaunty on the 755s)
-# d-i apt-setup/backports boolean true
-# Uncomment this if you don't want to use a network mirror.
-#d-i apt-setup/use_mirror boolean false
-# Select which update services to use; define the mirrors to be used.
-# Values shown below are the normal defaults.
-#d-i apt-setup/services-select multiselect security
-#d-i apt-setup/security_host string security.ubuntu.com
-#d-i apt-setup/security_path string /ubuntu
-d-i apt-setup/country string US
-# Actual mirror host now taken care of (semi-secretly) by the installer script.
-# d-i apt-setup/hostname string mirrors.mit.edu
-d-i apt-setup/directory string /ubuntu
-d-i apt-setup/country US
-
-
-# Additional repositories, local[0-9] available
-#d-i apt-setup/local0/repository string \
-# http://local.server/ubuntu hardy main
-#d-i apt-setup/local0/comment string local server
-# Enable deb-src lines
-#d-i apt-setup/local0/source boolean true
-# URL to the public key of the local repository; you must provide a key or
-# apt will complain about the unauthenticated repository and so the
-# sources.list line will be left commented out
-#d-i apt-setup/local0/key string http://local.server/key
-
-# By default the installer requires that repositories be authenticated
-# using a known gpg key. This setting can be used to disable that
-# authentication. Warning: Insecure, not recommended.
-#d-i debian-installer/allow_unauthenticated string true
-
-### Package selection
-tasksel tasksel/first multiselect standard, ubuntu-desktop
-#tasksel tasksel/first multiselect standard, lamp-server
-#tasksel tasksel/first multiselect standard, kubuntu-desktop
-
-# Individual additional packages to install
-#d-i pkgsel/include string openssh-server build-essential
-
-# Language pack selection
-#d-i pkgsel/language-packs multiselect de, en, zh
-
-# Some versions of the installer can report back on what software you have
-# installed, and what software you use. The default is not to report back,
-# but sending reports helps the project determine what software is most
-# popular and include it on CDs.
-#popularity-contest popularity-contest/participate boolean false
-
-### Boot loader installation
-# Grub is the default boot loader (for x86). If you want lilo installed
-# instead, uncomment this:
-#d-i grub-installer/skip boolean true
-# To also skip installing lilo, and install no bootloader, uncomment this
-# too:
-#d-i lilo-installer/skip boolean true
-
-# This is fairly safe to set, it makes grub install automatically to the MBR
-# if no other operating system is detected on the machine.
-d-i grub-installer/only_debian boolean true
-
-# This one makes grub-installer install to the MBR if it also finds some other
-# OS, which is less safe as it might not be able to boot that other OS.
-d-i grub-installer/with_other_os boolean true
-
-# Alternatively, if you want to install to a location other than the mbr,
-# uncomment and edit these lines:
-#d-i grub-installer/only_debian boolean false
-#d-i grub-installer/with_other_os boolean false
-#d-i grub-installer/bootdev string (hd0,0)
-# To install grub to multiple disks:
-#d-i grub-installer/bootdev string (hd0,0) (hd1,0) (hd2,0)
-
-# On systems where unauthorized users have access at boot time, you may want
-# to set a GRUB password, either in clear text
-#d-i grub-installer/password password insecure
-#d-i grub-installer/password-again password insecure
-# or encrypted using an MD5 hash.
-#d-i grub-installer/password-crypted password [MD5 hash]
-
-### Finishing up the installation
-# Avoid that last message about the install being complete.
-d-i finish-install/reboot_in_progress note
-
-# This will prevent the installer from ejecting the CD during the reboot,
-# which is useful in some situations.
-#d-i cdrom-detect/eject boolean false
-
-# This is how to make the installer shutdown when finished, but not
-# reboot into the installed system.
-#d-i debian-installer/exit/halt boolean true
-
-### X configuration
-# X can detect the right driver for some cards, but if you're preseeding,
-# you override whatever it chooses. Still, vesa will work most places.
-#xserver-xorg xserver-xorg/config/device/driver select vesa
-
-# A caveat with mouse autodetection is that if it fails, X will retry it
-# over and over. So if it's preseeded to be done, there is a possibility of
-# an infinite loop if the mouse is not autodetected.
-#xserver-xorg xserver-xorg/autodetect_mouse boolean true
-
-# Monitor autodetection is recommended.
-xserver-xorg xserver-xorg/autodetect_monitor boolean true
-# Uncomment if you have an LCD display.
-#xserver-xorg xserver-xorg/config/monitor/lcd boolean true
-# X has three configuration paths for the monitor. Here's how to preseed
-# the "medium" path, which is always available. The "simple" path may not
-# be available, and the "advanced" path asks too many questions.
-xserver-xorg xserver-xorg/config/monitor/selection-method select medium
-xserver-xorg xserver-xorg/config/monitor/mode-list select 1024x768 @ 60 Hz
-
-### Preseeding other packages
-# Depending on what software you choose to install, or if things go wrong
-# during the installation process, it's possible that other questions may
-# be asked. You can preseed those too, of course. To get a list of every
-# possible question that could be asked during an install, do an
-# installation, and then run these commands:
-# debconf-get-selections --installer > file
-# debconf-get-selections >> file
-
-
-#### Advanced options
-### Running custom commands during the installation
-# d-i preseeding is inherently not secure. Nothing in the installer checks
-# for attempts at buffer overflows or other exploits of the values of a
-# preconfiguration file like this one. Only use preconfiguration files from
-# trusted locations! To drive that home, and because it's generally useful,
-# here's a way to run any shell command you'd like inside the installer,
-# automatically.
-
-# This first command is run as early as possible, just after
-# preseeding is read.
-#d-i preseed/early_command string anna-install some-udeb
-
-d-i preseed/include_command string wget -q http://18.9.60.73/installer/precise/debathena-loader.sh ; sh debathena-loader.sh
diff --git a/tests/installer/vmware_config/default.nvram b/tests/installer/vmware_config/default.nvram
deleted file mode 100644
index 90ad36d..0000000
Binary files a/tests/installer/vmware_config/default.nvram and /dev/null differ
diff --git a/tests/installer/vmware_config/default.vmdk b/tests/installer/vmware_config/default.vmdk
deleted file mode 100644
index 8919132..0000000
Binary files a/tests/installer/vmware_config/default.vmdk and /dev/null differ
diff --git a/tests/installer/vmware_config/default.vmsd b/tests/installer/vmware_config/default.vmsd
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/installer/vmware_config/default.vmx b/tests/installer/vmware_config/default.vmx
deleted file mode 100755
index c2ae97c..0000000
--- a/tests/installer/vmware_config/default.vmx
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/usr/bin/vmware
-.encoding = "UTF-8"
-config.version = "8"
-virtualHW.version = "9"
-vcpu.hotadd = "TRUE"
-scsi0.present = "TRUE"
-scsi0.virtualDev = "lsilogic"
-memsize = "1024"
-mem.hotadd = "TRUE"
-scsi0:0.present = "TRUE"
-scsi0:0.fileName = "default.vmdk"
-ide1:0.present = "TRUE"
-ide1:0.fileName = "%ISO%"
-ide1:0.deviceType = "cdrom-image"
-floppy0.startConnected = "FALSE"
-floppy0.fileName = ""
-floppy0.autodetect = "TRUE"
-ethernet0.present = "TRUE"
-ethernet0.connectionType = "nat"
-ethernet0.wakeOnPcktRcv = "FALSE"
-ethernet0.addressType = "generated"
-usb.present = "TRUE"
-ehci.present = "TRUE"
-ehci.pciSlotNumber = "35"
-sound.present = "TRUE"
-sound.startConnected = "FALSE"
-sound.fileName = "-1"
-sound.autodetect = "TRUE"
-mks.enable3d = "TRUE"
-serial0.present = "TRUE"
-serial0.fileType = "thinprint"
-pciBridge0.present = "TRUE"
-pciBridge4.present = "TRUE"
-pciBridge4.virtualDev = "pcieRootPort"
-pciBridge4.functions = "8"
-pciBridge5.present = "TRUE"
-pciBridge5.virtualDev = "pcieRootPort"
-pciBridge5.functions = "8"
-pciBridge6.present = "TRUE"
-pciBridge6.virtualDev = "pcieRootPort"
-pciBridge6.functions = "8"
-pciBridge7.present = "TRUE"
-pciBridge7.virtualDev = "pcieRootPort"
-pciBridge7.functions = "8"
-vmci0.present = "TRUE"
-hpet0.present = "TRUE"
-usb.vbluetooth.startConnected = "TRUE"
-displayName = "default"
-guestOS = "ubuntu"
-nvram = "default.nvram"
-virtualHW.productCompatibility = "hosted"
-powerType.powerOff = "hard"
-powerType.powerOn = "hard"
-powerType.suspend = "hard"
-powerType.reset = "hard"
-extendedConfigFile = "default.vmxf"
-msg.autoAnswer = TRUE
-scsi0.pciSlotNumber = "16"
-ethernet0.generatedAddress = "00:0c:29:45:f5:2a"
-ethernet0.pciSlotNumber = "33"
-usb.pciSlotNumber = "32"
-sound.pciSlotNumber = "34"
-vmci0.id = "-79301334"
-vmci0.pciSlotNumber = "36"
-uuid.location = "56 4d 58 6d a0 c3 33 46-fc 19 df e6 fb 45 f5 2a"
-uuid.bios = "56 4d 58 6d a0 c3 33 46-fc 19 df e6 fb 45 f5 2a"
-cleanShutdown = "TRUE"
-replay.supported = "FALSE"
-replay.filename = ""
-scsi0:0.redo = ""
-pciBridge0.pciSlotNumber = "17"
-pciBridge4.pciSlotNumber = "21"
-pciBridge5.pciSlotNumber = "22"
-pciBridge6.pciSlotNumber = "23"
-pciBridge7.pciSlotNumber = "24"
-usb:0.present = "TRUE"
-usb:1.present = "TRUE"
-ethernet0.generatedAddressOffset = "0"
-vmotion.checkpointFBSize = "134217728"
-softPowerOff = "FALSE"
-usb:0.deviceType = "hid"
-usb:0.port = "0"
-usb:0.parent = "-1"
-usb:1.speed = "2"
-usb:1.deviceType = "hub"
-usb:1.port = "1"
-usb:1.parent = "-1"
diff --git a/tests/installer/vmware_config/default.vmxf b/tests/installer/vmware_config/default.vmxf
deleted file mode 100644
index b4748b7..0000000
--- a/tests/installer/vmware_config/default.vmxf
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<Foundry>
-<VM>
-<VMId type="string">52 46 f7 af 9b ea 75 0b-aa e0 9c f4 d0 4a ef 20</VMId>
-<ClientMetaData>
-<clientMetaDataAttributes/>
-<HistoryEventList/></ClientMetaData>
-<vmxPathName type="string">default.vmx</vmxPathName></VM></Foundry>
