Merge lp:~thomir-deactivatedaccount/adt-cloud-worker/uci-nova-testbed-fixes into lp:~canonical-ci-engineering/adt-cloud-worker/uci-nova

[Thomi Richards]

Include fixes from pitti's vm-setup script. Should improve pass rate.

Include fixes from pitti's vm-setup script. Should improve pass rate.

[lp:~thomir-deactivatedaccount/adt-cloud-worker/uci-nova-testbed-fixes]

8. By Thomi Richards on 2015-04-15

Fix typo.

[Joe Talbott (joetalbott)]

This looks okay to me.

review: Approve

[lp:~thomir-deactivatedaccount/adt-cloud-worker/uci-nova-testbed-fixes]

9. By Thomi Richards on 2015-04-15

Always reboot.

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve

=== modified file 'uci-nova'
--- uci-nova	2015-04-05 03:56:32 +0000
+++ uci-nova	2015-04-15 18:53:11 +0000
@@ -193,6 +193,11 @@
         
     # generate cloud-init user data; mostly for manage_etc_hosts, but also get
     # rid of some unnecessary stuff in the VM
+    #
+    # NOTE: The "#cloud-config" at the top of this file tells cloud-init that this is
+    # a config file, as opposed to a shell script (which must start with "#!"). Don't 
+    # Do what I did and think "commented out code! DELETE!" and then wonder why nothing
+    # works. - Thomi
     local userdata=`mktemp`
     cat <<EOF > $userdata
 #cloud-config
@@ -203,8 +208,20 @@
     ssh_enabled: True
 
 runcmd:
+ # Make apt faster:
  - echo 'Acquire::Languages "none";' > /etc/apt/apt.conf.d/90nolanguages
  - echo 'force-unsafe-io' > /etc/dpkg/dpkg.cfg.d/autopkgtest
+ # provides kmods like scsi_debug or mac80211_hwsim
+ - apt-get install -y linux-generic
+ # some tests use a lot of /dev/random, avoid hangs
+ - apt-get install -y haveged
+ # We need python to run the auxverb helper - install it iff it's missing:
+ - if ! sh -c 'type python3 >/dev/null 2>&1 || type python >/dev/null 2>&1'; then apt-get install -y --no-install-recommends python3-minimal; fi
+ # Remove some packages we don't need
+ - for p in accountsservice apt-xapian-index cryptsetup landscape-client landscape-common open-vm-tools w3m vim-runtime aptitude-common command-not-found-data manpages ntfs-3g sosreport ubuntu-release-upgrader-core; do apt-get --auto-remove -y purge \$p || true; done
+ - apt-get clean
+ # Do a dist-upgrade:
+ - DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade
 EOF
 
     EXTRA_OPTS=''
@@ -282,6 +299,8 @@
         cleanup
         exit 1
     fi
+    
+    reboot
 
 }