u1-test-utils

Merge lp:~elopio/u1-test-utils/purchase-saucy into lp:u1-test-utils

  1. purchase-saucy
  2. Merge into trunk
Proposed by Leo Arias
Status: Merged
Approved by: Leo Arias
Approved revision: 90
Merged at revision: 90
Proposed branch: lp:~elopio/u1-test-utils/purchase-saucy
Merge into: lp:u1-test-utils
Diff against target: 40 lines (+5/-10)
2 files modified
setup_vm/unity/transient-dist-upgrade (+0/-4)
setup_vm/vms.conf (+5/-6)
To merge this branch: bzr merge lp:~elopio/u1-test-utils/purchase-saucy
Reviewer Review Type Date Requested Status
Vincent Ladeuil (community) Approve
Review via email: mp+177310@code.launchpad.net

Commit message

Move the purchase testing machine to saucy.

To post a comment you must log in.
Revision history for this message
Vincent Ladeuil (vila) wrote :

Great to see the transient stuff removed

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'setup_vm/unity/transient-dist-upgrade'
2--- setup_vm/unity/transient-dist-upgrade 2013-04-12 08:42:30 +0000
3+++ setup_vm/unity/transient-dist-upgrade 1970-01-01 00:00:00 +0000
4@@ -1,4 +0,0 @@
5-#!/bin/sh
6-# For an unclear reason (probably a transient raring issue) we need to
7-# dist-upgrade instead of just upgrade
8-apt-get dist-upgrade -y
9
10=== modified file 'setup_vm/vms.conf'
11--- setup_vm/vms.conf 2013-07-05 14:59:05 +0000
12+++ setup_vm/vms.conf 2013-07-29 03:35:32 +0000
13@@ -83,9 +83,9 @@
14 vm.update=True
15 vm.uploaded_scripts=curucu/run
16
17-[raring-desktop-pristine]
18-vm.name=raring-desktop-pristine
19-vm.release=raring
20+[saucy-desktop-pristine]
21+vm.name=saucy-desktop-pristine
22+vm.release=saucy
23 # python-unittest2 is not strictly required here but works around sst
24 # insisting on installing it locally.
25 vm.packages=bzr, emacs23, pyflakes, python-setuptools, python-unittest2, python-autopilot, unity-autopilot, ubuntu-desktop, avahi-daemon
26@@ -96,12 +96,11 @@
27
28 [purchase-testing]
29 vm.name=purchase-testing
30-vm.release=raring
31-vm.backing=raring-desktop-pristine.qcow2
32+vm.release=saucy
33+vm.backing=saucy-desktop-pristine.qcow2
34 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
35 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
36 vm.uploaded_scripts=unity/run-sso-client, unity/run-unity-lens-music
37 # TODO unity/run-syncdaemon. We don't yet have the hermetic filesync server.
38 vm.update=True
39-vm.root_script=unity/transient-dist-upgrade
40 vm.ubuntu_script=unity/install-sources

Subscribers

People subscribed via source and target branches

to all changes: