Merge lp:~elopio/u1-test-utils/update-sso-dependencies into lp:u1-test-utils

[Leo Arias]

Update the installation of the SSO machine using the dependencies package.
Run the machine with the ubuntuone brand.

Following http://bazaar.launchpad.net/~canonical-isd-hackers/canonical-identity-provider/trunk/revision/952 we can now install all the dependencies for SSO with a meta package.

[lp:~elopio/u1-test-utils/update-sso-dependencies]

93. By Leo Arias on 2013-07-05

Last bits to make the run and run-for-pay more similar.

[Vincent Ladeuil (vila)]

Nice.

You may want to update your commit message to mention that you're also selecting the ubuntuone brand.

review: Approve

=== modified file 'setup_vm/sso/run'
--- setup_vm/sso/run	2013-03-16 22:38:01 +0000
+++ setup_vm/sso/run	2013-07-05 14:00:32 +0000
@@ -5,12 +5,13 @@
 .env/bin/twistd localmail --imap {sso.imap_port} --smtp {sso.smtp_port}
 
 # Setup the database.
+rm -fr .env/db # So this script can run more than once when needed
 fab setup_postgresql_server
 fab manage:loaddata,test
 fab manage:create_test_team
-# get gargoyle flags from their use in the code
-SST_FLAGS=`grep -rho --exclude 'test_*.py' "is_active([\"']\(.*\)[\"']" identityprovider/ webui/ | sed -E "s/is_active\(['\"](.*)['\"]/\1/" | awk '{print tolower($0)}' | sort | uniq | tr '\n' ','`
-# We need to remove the trailing ','
-fab gargoyle_flags:${SST_FLAGS%,}
+# add openid RP config                                                        
+# we need this to explicitly allow unverified logins                          
+fab manage:add_openid_rp_config,$SST_BASE_URL/consumer,--allow-unverified,--allowed-user-attribs="fullname\,nickname\,email\,language,account_verified"
+fab manage:add_switch,"brand_ubuntuone"
 # Start the SSO server, accessible from the local network.
-fab run:0.0.0.0:{sso.port}
+fab brand:ubuntuone run:0.0.0.0:{sso.port}

=== modified file 'setup_vm/sso/run-for-pay'
--- setup_vm/sso/run-for-pay	2013-05-11 15:23:33 +0000
+++ setup_vm/sso/run-for-pay	2013-07-05 14:00:32 +0000
@@ -5,10 +5,11 @@
 .env/bin/twistd localmail --imap {sso.imap_port} --smtp {sso.smtp_port}
 
 # Setup the database.
+rm -fr .env/db # So this script can run more than once when needed
 fab setup_postgresql_server
 fab manage:loaddata,isdtest
-fab manage:loaddata,allow_unverified
 # Set the allow-unverified config for Pay.
 fab manage:add_openid_rp_config,{pay.url},--allow-unverified,--allowed-user-attribs="fullname\,nickname\,email\,language"
+fab manage:add_switch,"brand_ubuntuone"
 # Start the SSO server, accessible from the local network.
 fab run:0.0.0.0:{sso.port}

=== modified file 'setup_vm/sso/run-for-u1'
--- setup_vm/sso/run-for-u1	2013-06-11 17:45:39 +0000
+++ setup_vm/sso/run-for-u1	2013-07-05 14:00:32 +0000
@@ -40,5 +40,6 @@
 
 EOF
 fab manage:loaddata,apiuser
+fab manage:add_switch,"brand_ubuntuone"
 # Start the SSO server, accessible from the local network.
-fab run:0.0.0.0:{sso.port}
+fab brand:ubuntuone run:0.0.0.0:{sso.port}

=== modified file 'setup_vm/sso/test'
--- setup_vm/sso/test	2013-03-13 18:23:17 +0000
+++ setup_vm/sso/test	2013-07-05 14:00:32 +0000
@@ -5,7 +5,5 @@
 
 cd {sso.src_dir}
 
-# get gargoyle flags from their use in the code
-SST_FLAGS=`grep -rho --exclude 'test_*.py' "is_active([\"']\(.*\)[\"']" identityprovider/ webui/ | sed -E "s/is_active\(['\"](.*)['\"]/\1/" | awk '{print tolower($0)}' | sort | uniq | tr '\n' ';'`
 # run tests                                                                    
-SST_BASE_URL={sso.url} fab acceptance:screenshot=true,report=xml,extended=true,flags=$SST_FLAGS
+SST_BASE_URL={sso.url} fab acceptance:screenshot=true,report=xml,headless=True
\ No newline at end of file

=== modified file 'setup_vm/vms.conf'
--- setup_vm/vms.conf	2013-06-12 06:05:33 +0000
+++ setup_vm/vms.conf	2013-07-05 14:00:32 +0000
@@ -42,10 +42,11 @@
 vm.name=sso
 vm.release=precise
 vm.backing=precise-server-pristine.qcow2
-vm.packages=config-manager, fabric, libpq-dev, make, memcached, postgresql-plpython, python-m2crypto, python-dev, python-setuptools, python-virtualenv, swig, wget, libxml2-dev, libxslt1-dev
+vm.apt_sources=deb http://ppa.launchpad.net/canonical-isd-hackers/dependencies/ubuntu {vm.release} main|F5410BE0
+vm.packages=python-software-properties, canonical-identity-provider-dependencies, canonical-identity-provider-developer-dependencies
 vm.ubuntu_script=sso/install
 vm.update=True
-vm.uploaded_scripts=sso/run, sso/run-for-pay, sso/run-for-u1
+vm.uploaded_scripts=sso/run, sso/test, sso/run-for-pay, sso/run-for-u1
 
 [pay]
 vm.name=pay