Merge lp:~elopio/u1-test-utils/scopes_machine into lp:u1-test-utils

[Leo Arias]

[lp:~elopio/u1-test-utils/scopes_machine]

85. By Leo Arias on 2013-06-23

Removed the spaces.

86. By Leo Arias on 2013-06-23

Added the install-sources script for smart scopes.

87. By Leo Arias on 2013-06-25

Added the sources to run smart scopes tests.

Unmerged revisions

87. By Leo Arias on 2013-06-25

Added the sources to run smart scopes tests.

86. By Leo Arias on 2013-06-23

Added the install-sources script for smart scopes.

85. By Leo Arias on 2013-06-23

Removed the spaces.

84. By Leo Arias on 2013-06-23

Added the install script and config values

83. By Leo Arias on 2013-06-23

Renamed the directory with the music lens scripts.

82. By Leo Arias on 2013-06-23

Merged with trunk.

81. By Leo Arias on 2013-06-23

Added the scopes machine config.

=== renamed directory 'setup_vm/unity' => 'setup_vm/musiclens'
=== added directory 'setup_vm/smartscopes'
=== added file 'setup_vm/smartscopes/install-sources'
--- setup_vm/smartscopes/install-sources	1970-01-01 00:00:00 +0000
+++ setup_vm/smartscopes/install-sources	2013-06-25 20:11:22 +0000
@@ -0,0 +1,16 @@
+#!/bin/sh
+# 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
+mkdir ~/src
+# Get the in-dash payments test branch
+# TODO split and move the scopes tests to a different project.
+cd ~/src
+# TODO update the location when the branch is merged. -elopio -- 2013-06-22
+bzr branch lp:~elopio/u1-test-utils/smart_scopes_tests
+cat <<EOF >~/src/test-in-dash-payments/tests/local.cfg
+[smartscopes]
+smartscopes_server_url = {curucu.url}
+smartscopes_geo_store = {music_search.geo_store_id}
+    
+EOF

=== modified file 'setup_vm/u1/install'
--- setup_vm/u1/install	2013-06-19 21:05:31 +0000
+++ setup_vm/u1/install	2013-06-25 20:11:22 +0000
@@ -56,9 +56,7 @@
 else
     monday=`date -dlast-monday +%Y%m%d`
 fi
-# 496 is the id of the world shop. The other ids can be found on the cerati branch, cerati/parameters.py:MUSIC_PROVIDER_SHOP_IDS.
-# TODO should we add them? --elopio - 20130520
-monday_shop_dir=working_dir/$monday/shop-496
+monday_shop_dir=working_dir/$monday/shop-{music_search.geo_store_id}
 mkdir -p $monday_shop_dir
 cat <<EOF >$monday_shop_dir/artist-full.csv
 artistId,name,popularity,tags,image,url

=== modified file 'setup_vm/u1/run-music-search'
--- setup_vm/u1/run-music-search	2013-05-23 21:07:38 +0000
+++ setup_vm/u1/run-music-search	2013-06-25 20:11:22 +0000
@@ -10,9 +10,7 @@
 else
     monday=`date -dlast-monday +%Y%m%d`
 fi
-# 496 is the id of the world shop. The other ids can be found on the cerati branch, cerati/parameters.py:MUSIC_PROVIDER_SHOP_IDS.
-# TODO should we add them? --elopio - 20130520
-./utilities/seven_digital/manage.py import_7d_to_solr canonical {music_search.token} --shop-ids 496 --solr-port `ps fax | grep jetty.port | tail -n 1 | sed 's/.*jetty.port=\([0-9]*\).*/\1/'` --limit 1000 --date $monday
+./utilities/seven_digital/manage.py import_7d_to_solr canonical {music_search.token} --shop-ids {music_search.geo_store_id} --solr-port `ps fax | grep jetty.port | tail -n 1 | sed 's/.*jetty.port=\([0-9]*\).*/\1/'` --limit 1000 --date $monday
 cd ~/{music_search.src_dir}
 echo `ps fax | grep jetty.port | tail -n 1 | sed 's/.*jetty.port=\([0-9]*\).*/\1/'` > tmp/jetty.port
 PYTHONPATH=.:lib:$PYTHONPATH U1CONFIG=configs/local-lazr.conf gunicorn cerati.views:app -b 0.0.0.0:{music_search.port}

=== modified file 'setup_vm/vms.conf'
--- setup_vm/vms.conf	2013-06-12 06:05:33 +0000
+++ setup_vm/vms.conf	2013-06-25 20:11:22 +0000
@@ -27,11 +27,17 @@
 music_search.port=8004
 music_search.address={u1.address}
 music_search.url=http://{music_search.address}:{music_search.port}
+# 496 is the id of the world shop. The other ids can be found on the cerati branch, cerati/parameters.py:MUSIC_PROVIDER_SHOP_IDS.
+music_search.geo_store_id = 496
 
 curucu.src_dir=curucu
 curucu.port=8005
 curucu.url=http://{curucu.address}:{curucu.port}
 
+# python-unittest2 is not strictly required here but works around sst
+# insisting on installing it locally.
+desktop.packages=bzr, emacs23, pyflakes, python-setuptools, python-unittest2, python-autopilot, unity-autopilot, ubuntu-desktop, avahi-daemon
+
 [precise-server-pristine]
 vm.name=precise-server-pristine
 vm.release=precise
@@ -79,13 +85,11 @@
 [raring-desktop-pristine]
 vm.name=raring-desktop-pristine
 vm.release=raring
-# python-unittest2 is not strictly required here but works around sst
-# insisting on installing it locally.
-vm.packages=bzr, emacs23, pyflakes, python-setuptools, python-unittest2, python-autopilot, unity-autopilot, ubuntu-desktop, avahi-daemon
+vm.packages={desktop.packages}
 vm.update=True
 # Roughly all vms installing ubuntu-desktop need to complete the
 # installation by making the ubuntu user part of the admin group.
-vm.root_script = bin/ubuntu_admin.sh
+vm.root_script=bin/ubuntu_admin.sh
 
 [purchase-testing]
 vm.name=purchase-testing
@@ -93,8 +97,27 @@
 vm.backing=raring-desktop-pristine.qcow2
 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, python-requests, python-mock, python-django, python-django-configglue, python-piston-mini-client, python-dateutil, xvfb
-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
+vm.uploaded_scripts=musiclens/run-sso-client, musiclens/run-unity-lens-music
+# TODO musiclens/run-syncdaemon. We don't yet have the hermetic filesync
+# server.
+vm.update=True
+vm.root_script=musiclens/transient-dist-upgrade
+vm.ubuntu_script=musiclens/install-sources
+
+[saucy-desktop-pristine]
+vm.name=saucy-desktop-pristine
+vm.release=saucy
+vm.packages={desktop.packages}
+vm.update=True
+# Roughly all vms installing ubuntu-desktop need to complete the
+# installation by making the ubuntu user part of the admin group.
+vm.root_script=bin/ubuntu_admin.sh
+
+[scopes-testing]
+vm.name=scopes-testing
+vm.release=saucy
+vm.backing=saucy-desktop-pristine.qcow2
+vm.apt_sources=deb http://ppa.launchpad.net/vila/selenium/ubuntu {vm.release} main|5703355D
+vm.packages=python-django, python-django-configglue, python-selenium, python-sst, libautopilot-qt
+vm.update=True
+vm.ubuntu_script=smartscopes/install-sources
\ No newline at end of file