Merge lp:~vila/u1-test-utils/setup-vm into lp:u1-test-utils

[Vincent Ladeuil]

vms.conf cleanup.

Some additional tweaks including some vms.conf cleanup.

[Leo Arias (elopio)]

review: Approve (code review)

=== modified file 'setup_vm/NOTES'
--- setup_vm/NOTES	2013-04-12 08:19:29 +0000
+++ setup_vm/NOTES	2013-04-23 15:25:31 +0000
@@ -29,7 +29,7 @@
   # Tweak according to your squid-deb-proxy setup, 8000 is the default port. 
   # Use {your-ip} or any address reachable by the vms (keeping in mind that
   # avahi's .local domain may not be up in the early stages of the install
-  vm.apt_proxy = http://{your-ip}:800
+  vm.apt_proxy = http://{your-ip}:8000
   vm.launchpad_id=your-launchpad-id
   # This is the ssh key of your host machine. Make sure that you have
   uploaded it to https://launchpad.net/~/+editsshkeys
@@ -51,8 +51,8 @@
 
 5. Get the branch:
 
-  $ bzr branch lp:~online-services-qa/u1-test-utils/setup_vm
-  $ cd setup_vm
+  $ bzr branch lp:u1-test-utils
+  $ cd u1-test-utils/setup_vm
 
 6. Download the image for the server (do so every time you want to use a
    fresh image):

=== modified file 'setup_vm/unity/install-sources'
--- setup_vm/unity/install-sources	2013-04-04 16:16:32 +0000
+++ setup_vm/unity/install-sources	2013-04-23 15:25:31 +0000
@@ -2,18 +2,4 @@
 # Allow ssh access to launchpad.
 # This should probably be provided by setup_vm. -- vila 2013-03-10
 ssh-keyscan bazaar.launchpad.net >>~/.ssh/known_hosts
-# Install sst and dependencies from source
-mkdir src
-cd src
-bzr branch lp:~ubuntuone-hackers/ubuntuone-servers/selenium
-bzr branch lp:~canonical-isd-qa/selenium-simple-test/trunk selenium-simple-test
-cd ~/src/selenium
-python setup.py install --user
-cd ~/src/selenium-simple-test
-python setup.py install --user
-
-# If the need arise to use sst-run, it may become necessary to create a
-# symlink to /home/ubuntu/.local/bin/sst-run
-
-# Also note that unittest2 is installed as a side-effect of installing sst
-# even if we're already using pyton-2.7 (which includes unittest2 features).
+# No sources to install but we're ready to if needed ;)

=== modified file 'setup_vm/vms.conf'
--- setup_vm/vms.conf	2013-04-22 04:26:11 +0000
+++ setup_vm/vms.conf	2013-04-23 15:25:31 +0000
@@ -69,28 +69,9 @@
 vm.name=purchase-testing
 vm.release=raring
 vm.backing=raring-desktop-pristine.qcow2
-vm.apt_sources=deb http://ppa.launchpad.net/ubuntuone/dashpurchase-testing/ubuntu {vm.release} main|4BD0ECAE
-vm.update=True
-vm.ubuntu_script=purchase-testing/install
-
-[unity-prevalidation]
-vm.name=unity-prevalidation
-vm.release=raring
-vm.backing=raring-desktop-pristine.qcow2
-vm.apt_sources=deb http://ppa.launchpad.net/ubuntu-unity/experimental-prevalidation/ubuntu {vm.release} main|52D62F45
-vm.uploaded_scripts=unity/run-sso-client, unity/run-unity-lens-music
-# TODO unity/run-syncdaemon. We don't yet have the hermetic filesync server.
-vm.update=True
-vm.root_script=unity/transient-dist-upgrade
-vm.ubuntu_script=unity/install-sources
-
-[indash-didrocks]
-vm.name=indash-didrocks
-vm.release=raring
-vm.backing=raring-desktop-pristine.qcow2
-vm.apt_sources=ppa:didrocks/ppa, ppa:ubuntuone/nightlies
-vm.uploaded_scripts=unity/run-sso-client, unity/run-unity-lens-music
-vm.packages=ubuntuone-dev-tools, libautopilot-qt
+vm.apt_sources=deb http://ppa.launchpad.net/ubuntuone/dashpurchase-testing/ubuntu {vm.release} main|4BD0ECAE,deb http://ppa.launchpad.net/vila/selenium/ubuntu {vm.release} main|5703355D,ppa:ubuntuone/nightlies
+vm.packages=python-selenium, python-sst, ubuntuone-dev-tools, libautopilot-qt
+vm.uploaded_scripts=unity/run-sso-client, unity/run-unity-lens-music
 # TODO unity/run-syncdaemon. We don't yet have the hermetic filesync server.
 vm.update=True
 vm.root_script=unity/transient-dist-upgrade