Merge lp:~frankban/charms/precise/juju-gui/trusty-charm into lp:~juju-gui/charms/precise/juju-gui/trunk

[Francesco Banconi]

Trusty charm.

Make the charm work on trusty.
Also update the charm documentation.

QA:
Please run the unit and functional tests
using both precise and trusty.
Follow the instructions in the HACKING file.

https://codereview.appspot.com/88100044/

[Francesco Banconi (frankban)]

Reviewers: mp+215867_code.launchpad.net,

Message:
Please take a look.

Description:
Trusty charm.

Make the charm work on trusty.
Also update the charm documentation.

QA:
Please run the unit and functional tests
using both precise and trusty.
Follow the instructions in the HACKING file.

https://code.launchpad.net/~frankban/charms/precise/juju-gui/trusty-charm/+merge/215867

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/88100044/

Affected files (+154, -92 lines):
   M HACKING.md
   M Makefile
   M README.md
   A [revision details]
   M config.yaml
   M hooks/utils.py
   M revision
   M tests/20-functional.test
   M tests/deploy.py

[Brad Crittenden (bac)]

LGTM.
Will now QA.

https://codereview.appspot.com/88100044/diff/1/HACKING.md
File HACKING.md (left):

https://codereview.appspot.com/88100044/diff/1/HACKING.md#oldcode23
HACKING.md:23: do not yet have an environment defined, the Jitsu command
"setup-environment"
yay, death to jitsu

https://codereview.appspot.com/88100044/diff/1/HACKING.md
File HACKING.md (right):

https://codereview.appspot.com/88100044/diff/1/HACKING.md#newcode24
HACKING.md:24: way to get started. See
https://pypi.python.org/pypi/juju-quickstart.
Do you prefer pypi to the package just because we have tighter control
over it and it may be more up-to-date?

https://codereview.appspot.com/88100044/diff/1/HACKING.md#newcode62
HACKING.md:62: version the charm will be deployed by functional tests.
For instance, to test
This sentence ends clumsily. How about

Since functional tests deploy the charm in the
bootstrap node, setting the default series also selects which series
version the charm will be deployed by functional tests.

https://codereview.appspot.com/88100044/diff/1/HACKING.md#newcode66
HACKING.md:66: Long story short, to run both unit and functional the
tests:
s/the tests/tests/

https://codereview.appspot.com/88100044/diff/1/HACKING.md#newcode128
HACKING.md:128: The `make deploy` command also support specifying the OS
version used to deploy
s/support/supports/

https://codereview.appspot.com/88100044/diff/1/Makefile
File Makefile (right):

https://codereview.appspot.com/88100044/diff/1/Makefile#newcode83
Makefile:83: @echo 'make deploy [JUJU_ENV="my-juju-env"]
[SERIES="trusty"] - Deploy and'
Shouldn't this say SERIES="precise|trusty" or do you just include trusty
because precise is the default?

https://codereview.appspot.com/88100044/diff/1/README.md
File README.md (right):

https://codereview.appspot.com/88100044/diff/1/README.md#newcode47
README.md:47: add additional machines (i.e. the GUI is installed in the
bootstrap node).
Two parenthetic i.e. clauses in one sentence is a red flag. How about:

When possible, Quickstart conserves resources by installing the GUI on
the bootstrap node. This colocation is not possible when using a local
(LXC) environment.

https://codereview.appspot.com/88100044/diff/1/README.md#newcode165
README.md:165: While the Juju GUI itself is a client side JavaScript
application, the charm
trivial: client-side

https://codereview.appspot.com/88100044/diff/1/README.md#newcode166
README.md:166: installation also involves configuring a starting a GUI
server, which is
configuring and starting?

https://codereview.appspot.com/88100044/diff/1/README.md#newcode205
README.md:205: * The legacy server is no longer supported/tested staring
from trusty.
typo:starting

https://codereview.appspot.com/88100044/

[lp:~frankban/charms/precise/juju-gui/trusty-charm]

184. By Francesco Banconi on 2014-04-15

Changes as per review.

[Francesco Banconi (frankban)]

Please take a look.

https://codereview.appspot.com/88100044/diff/1/HACKING.md
File HACKING.md (right):

https://codereview.appspot.com/88100044/diff/1/HACKING.md#newcode24
HACKING.md:24: way to get started. See
https://pypi.python.org/pypi/juju-quickstart.
On 2014/04/15 13:50:16, bac wrote:
> Do you prefer pypi to the package just because we have tighter control
over it
> and it may be more up-to-date?

I prefer PyPI because the page automatically shows the most recent
quickstart README, including installation instructions.

https://codereview.appspot.com/88100044/diff/1/HACKING.md#newcode62
HACKING.md:62: version the charm will be deployed by functional tests.
For instance, to test
On 2014/04/15 13:50:16, bac wrote:
> This sentence ends clumsily. How about

> Since functional tests deploy the charm in the
> bootstrap node, setting the default series also selects which series
> version the charm will be deployed by functional tests.

Done.

https://codereview.appspot.com/88100044/diff/1/HACKING.md#newcode66
HACKING.md:66: Long story short, to run both unit and functional the
tests:
On 2014/04/15 13:50:16, bac wrote:
> s/the tests/tests/

Done.

https://codereview.appspot.com/88100044/diff/1/HACKING.md#newcode128
HACKING.md:128: The `make deploy` command also support specifying the OS
version used to deploy
On 2014/04/15 13:50:16, bac wrote:
> s/support/supports/

Done.

https://codereview.appspot.com/88100044/diff/1/Makefile
File Makefile (right):

https://codereview.appspot.com/88100044/diff/1/Makefile#newcode83
Makefile:83: @echo 'make deploy [JUJU_ENV="my-juju-env"]
[SERIES="trusty"] - Deploy and'
On 2014/04/15 13:50:16, bac wrote:
> Shouldn't this say SERIES="precise|trusty" or do you just include
trusty because
> precise is the default?

Yes, "trusty" is just an example, and "precise" is the default.

https://codereview.appspot.com/88100044/diff/1/README.md
File README.md (right):

https://codereview.appspot.com/88100044/diff/1/README.md#newcode47
README.md:47: add additional machines (i.e. the GUI is installed in the
bootstrap node).
On 2014/04/15 13:50:16, bac wrote:
> Two parenthetic i.e. clauses in one sentence is a red flag. How
about:

> When possible, Quickstart conserves resources by installing the GUI on
the
> bootstrap node. This colocation is not possible when using a local
(LXC)
> environment.

Done.

https://codereview.appspot.com/88100044/diff/1/README.md#newcode165
README.md:165: While the Juju GUI itself is a client side JavaScript
application, the charm
On 2014/04/15 13:50:16, bac wrote:
> trivial: client-side

Done.

https://codereview.appspot.com/88100044/diff/1/README.md#newcode166
README.md:166: installation also involves configuring a starting a GUI
server, which is
On 2014/04/15 13:50:16, bac wrote:
> configuring and starting?

Done.

https://codereview.appspot.com/88100044/diff/1/README.md#newcode205
README.md:205: * The legacy server is no longer supported/tested staring
from trusty.
On 2014/04/15 13:50:16, bac wrote:
> typo:starting

Done, also fixed in the config.yaml.

https://codereview.appspot.com/88100044/

[Brad Crittenden (bac)]

QA OK

https://codereview.appspot.com/88100044/

[Francesco Banconi (frankban)]

*** Submitted:

Trusty charm.

Make the charm work on trusty.
Also update the charm documentation.

QA:
Please run the unit and functional tests
using both precise and trusty.
Follow the instructions in the HACKING file.

R=bac
CC=
https://codereview.appspot.com/88100044

https://codereview.appspot.com/88100044/

=== modified file 'HACKING.md'
--- HACKING.md	2014-03-05 14:55:28 +0000
+++ HACKING.md	2014-04-15 14:24:45 +0000
@@ -20,8 +20,8 @@
 
 First, you need a configured Juju environment: see the Juju docs about
 [getting started](https://juju.ubuntu.com/docs/getting-started.html). If you
-do not yet have an environment defined, the Jitsu command "setup-environment"
-is an easy way to get started.
+do not yet have an environment defined, the Juju Quickstart plugin is an easy
+way to get started. See https://pypi.python.org/pypi/juju-quickstart.
 
 You'll also need some system dependencies and developer basics.
 
@@ -35,17 +35,12 @@
 You could start hacking now, but there's a bit more to do to prepare for
 running and writing tests.
 
-We use the juju-test test command to run our functional and unit tests.  At the
-time of this writing it is not yet released.  To run it you must first install
-it locally, e.g.:
-
-    bzr checkout --lightweight lp:juju-plugins
-    ln -s juju-plugins/plugins/juju_test.py juju-test
-    export PATH="$PATH":`pwd`
-
-Alternatively you may check out lp:juju-plugins and link
-"juju-plugins/plugins/juju_test.py" as "juju-test" somewhere in your PATH, so
-that it is possible to execute "juju-test".
+We use the juju-test test command to run our functional and unit tests. It is
+available as part of the charm tools package:
+
+    sudo add-apt-repository ppa:juju/stable
+    sudo apt-get update
+    sudo apt-get install charm-tools
 
 Before being able to run the suite, test requirements need to be installed
 running the command:
@@ -53,15 +48,23 @@
     make
 
 The command above will create a ".venv" directory inside "juju-gui/tests/",
-ignored by DVCSes, containing the development virtual environment with all the
-testing dependencies.  Run "make help" to see all the available make targets.
-
-Now you are ready to run the functional and unit tests (see the next section).
+ignored by version control, containing the development virtual environment with
+all the testing dependencies.
+Run "make help" to see all the available make targets.
 
 ## Testing ##
 
 There are two types of tests for the charm: unit tests and functional tests.
-Long story short, to run all the tests:
+
+Functional tests make use of a real Juju environment, and thus they need the
+`~/.juju/environments.yaml` file to be properly configured, including the
+`default-series` option. Since functional tests deploy the charm in the
+bootstrap node, setting the default series also selects which series version
+the charm will be deployed by functional tests. For instance, to test the Juju
+GUI charm on trusty, set `default-series: trusty` in your
+`~/.juju/environments.yaml` file. Possible values are `precise` and `trusty`.
+
+Long story short, to run both unit and functional tests:
 
     make test JUJU_ENV="myenv"
 
@@ -69,9 +72,9 @@
 your `~/.juju/environments.yaml`, that will be bootstrapped before running the
 tests and destroyed at the end of the test run.
 
-Note that the functional tests will not work using an LXC environment.  The
-test co-locates the juju-gui on the bootstrap node, which is not possible in
-LXC.
+Note that the **functional tests will not work using an LXC environment**.
+As mentioned, the test co-locates the juju-gui on the bootstrap node, which is
+not possible in LXC.
 
 Please read further for additional details.
 
@@ -98,15 +101,6 @@
 `~/.juju/environments.yaml`, that will be bootstrapped before running the
 tests and destroyed at the end of the test run.
 
-#### LXC ####
-
-Unfortunately, we have not found LXC-based Juju environments to be reliable
-for these tests.  At this time, we recommend using other environments, such as
-OpenStack; but we will periodically check the tests in LXC environments
-because it would be great to be able to use it.  If you do want to use LXC,
-you will need to install the `apt-cacher-ng` and `lxc` packages.  Also note
-that at this time juju-core does not support the local provider.
-
 ## Running the Charm From Development ##
 
 If you have set up your environment to run your local development charm,
@@ -132,6 +126,12 @@
 you to manually set up a local Juju environment, and preserves, if already
 created, the testing virtualenv.
 
+The `make deploy` command also supports specifying the OS version used to
+deploy the local charm. By default a precise machine is created, but you can
+run the following to deploy the charm on trusty:
+
+    make deploy SERIES=trusty
+
 Now you are working with a test run, as described in
 <https://juju.ubuntu.com/docs/write-charm.html#test-run>.  The
 `juju debug-hooks` command, described in the same web page, is your most

=== modified file 'Makefile'
--- Makefile	2014-01-21 15:08:17 +0000
+++ Makefile	2014-04-15 14:24:45 +0000
@@ -80,10 +80,11 @@
 	@echo -e '  JUJU_ENV is the Juju environment that will be bootstrapped.\n'
 	@echo -e 'make lint - Run linter and pep8.\n'
 	@echo -e 'make clean - Remove bytecode files and virtualenvs.\n'
-	@echo 'make deploy [JUJU_ENV="my-juju-env]" - Deploy and expose the Juju'
-	@echo '  GUI charm setting up a temporary Juju repository. Wait for the'
-	@echo '  service to be started.  If JUJU_ENV is not passed, the charm will'
-	@echo '  be deployed in the default Juju environment.'
+	@echo 'make deploy [JUJU_ENV="my-juju-env"] [SERIES="trusty"] - Deploy and'
+	@echo '  expose the Juju GUI charm setting up a temporary Juju repository.'
+	@echo '  Wait for the service to be started. If JUJU_ENV is not passed,'
+	@echo '  the charm will be deployed in the default Juju environment.'
+	@echo '  If SERIES is not passed, "precise" is used.'
 
-.PHONY: all clean deploy ensure-juju-test ensure-juju-env ftest help \
-    jujutest lint setup test unittest
+.PHONY: all clean deploy ensure-juju-env ensure-juju-test ftest help \
+    jujutest lint setup sysdeps test unittest

=== modified file 'README.md'
--- README.md	2014-01-15 14:59:56 +0000
+++ README.md	2014-04-15 14:24:45 +0000
@@ -13,8 +13,8 @@
 
 ## Supported Browsers ##
 
-The Juju GUI supports recent releases of the Chrome, Chromium and Firefox web
-browsers.
+The Juju GUI supports recent releases of the Chrome, Chromium, Firefox, Safari
+and Internet Explorer web browsers.
 
 ## Demo and Staging Servers ##
 
@@ -25,9 +25,35 @@
 A [staging server](http://comingsoon.jujucharms.com/) is also available,
 running the latest and greatest version.
 
-## Deploying the Juju GUI ##
-
-Deploying the Juju GUI is accomplished using Juju itself.
+## Deploying the Juju GUI using Juju Quickstart ##
+
+[Juju Quickstart](https://pypi.python.org/pypi/juju-quickstart) is an
+opinionated command-line tool that quickly starts Juju and the GUI, whether
+you've never installed Juju or you have an existing Juju environment running.
+
+For installation on precise and saucy, you'll need to enable the Juju PPA by
+first executing:
+
+    sudo add-apt-repository ppa:juju/stable
+    sudo apt-get update
+    sudo apt-get install juju-quickstart
+
+For trusty the PPA is not required and you simply need to install it with:
+
+    sudo apt-get install juju-quickstart
+
+At this point, just running `juju-quickstart` will deploy the Juju GUI. When
+possible, Quickstart conserves resources by installing the GUI on the bootstrap
+node. This colocation is not possible when using a local (LXC) environment.
+
+Quickstart ends by opening the browser and automatically logging the user into
+the GUI, to observe and manage the environment visually.
+By default, the deployment uses self-signed certificates. The browser will ask
+you to accept a security exception once.
+
+## Deploying the Juju GUI the traditional way ##
+
+Deploying the Juju GUI can be accomplished using Juju itself.
 
 You need a configured and bootstrapped Juju environment: see the Juju docs
 about [getting started](https://juju.ubuntu.com/docs/getting-started.html),
@@ -35,12 +61,17 @@
 
     juju bootstrap
 
-Next, you simply need to deploy the charm and expose it.  (See also "Deploying
-with Jitsu" below, for another option.)
+Next, you simply need to deploy the charm and expose it.
 
     juju deploy juju-gui
     juju expose juju-gui
 
+The instructions above cause you to use a separate machine to work with the
+GUI.  If you'd like to reduce your machine footprint (and perhaps your costs),
+you can colocate the GUI with the Juju bootstrap node, e.g.:
+
+    juju deploy juju-gui --to 0
+
 Finally, you need to identify the GUI's URL. It can take a few minutes for the
 GUI to be built and to start; this command will let you see when it is ready
 to go by giving you regular status updates:
@@ -73,8 +104,8 @@
 you to accept a security exception once.
 
 You will see a login form with the username fixed to "user-admin". The
-password is the same as your Juju environment's `admin-secret`, found in
-`~/.juju/environments.yaml`.
+password is the same as your Juju environment's `admin-secret`. The login
+screen includes hints about where to find the environment's password.
 
 ### Deploying behind a firewall ###
 
@@ -129,23 +160,53 @@
 In this case the new version will be found in the local repository and
 therefore the charm will not attempt to connect to Launchpad.
 
-### Deploying to a chosen machine ###
-
-The instructions above cause you to use a separate machine to work with the
-GUI.  If you'd like to reduce your machine footprint (and perhaps your costs),
-you can colocate the GUI with the Juju bootstrap node.
-
-This approach might change in the future (possibly with the Juju shipped with
-Ubuntu 13.10), so be warned.
-
-The instructions differ depending on the Juju implementation.
-
-#### juju-core ####
-
-Replace "juju deploy cs:precise/juju-gui" from the previous
-instructions with this:
-
-    juju deploy --force-machine 0 cs:precise/juju-gui
+## The Juju GUI server ##
+
+While the Juju GUI itself is a client-side JavaScript application, the charm
+installation also involves configuring and starting a GUI server, which is
+required to serve the application files and to enable some advanced features,
+so that using the GUI results in a seamless and powerful experience.
+
+### Builtin server ###
+
+By default, a builtin server is installed and started by the charm.
+The builtin server is already included in the charm. For this reason, it does
+not require any external dependencies.
+The builtin server provides the following functionalities:
+
+1. It serves the Juju GUI static files, including support for ETags and basic
+   server side URL routing.
+2. It supports running the GUI over TLS (HTTPS) or in insecure mode (HTTP).
+3. It redirects secure WebSocket connections established by the browser to
+   the real Juju API endpoint. This way the GUI can connect the WebSocket to
+   the host and port where it is currently running, so that the already
+   accepted self signed certificate is reused and the connection succeeds.
+4. It supports running the Juju GUI browser tests if the charm is configured
+   accordingly.
+5. It exposes an API for bundles deployment. This way bundles can be deployed
+   very easily using the GUI, by selecting a bundle from the GUI browser or
+   just dragging and dropping a bundle YAML file to the GUI canvas.
+6. It allows for logging in into the GUI via a timed token. This is used, for
+   instance, by Juju Quickstart to allow automatic user's authentication.
+7. It supports deploying local charms by proxying browser HTTPS connections to
+   the Juju HTTPS API backend. This also includes retrieving and listing local
+   charms' files.
+
+### Legacy server ###
+
+By switching the charm option `builtin-server` to `false`, the charm configures
+and start the legacy server in place of the builtin one. This configuration
+requires retrieving HAProxy from an external PPA and uses HAProxy and Apache to
+serve the Juju GUI.
+
+Using the builtin server is the encouraged configuration, but if you decide to
+stick with the legacy server, be warned about the following limitations:
+
+* The legacy server is no longer supported/tested starting from trusty.
+  Use it only if the charm is deployed on a precise machine.
+* The legacy server only provides features 1-4 from the list above. This means
+  bundle deployments, timed authentication tokens and local charms are not
+  available when using the legacy configuration.
 
 ## Contacting the Developers ##
 

=== modified file 'config.yaml'
--- config.yaml	2014-02-04 20:07:31 +0000
+++ config.yaml	2014-04-15 14:24:45 +0000
@@ -150,13 +150,16 @@
     description: |
       Enable the built-in server, disabling both haproxy and Apache.
       This is a temporary option: the built-in server will be
-      the only server in the future.
+      the only server in the future. Note that legacy server is no longer
+      supported/tested starting from trusty. Switch this option to false only
+      if the charm is deployed on a precise machine.
     type: boolean
     default: true
   builtin-server-logging:
     description: |
       Set the GUI server log level. Possible values are debug, info, warning
       and error. The log file is placed in /var/log/upstart/guiserver.log.
+      This option is ignored if builtin-server is set to false.
     type: string
     default: info
   nagios_context:

=== modified file 'hooks/utils.py'
--- hooks/utils.py	2014-02-28 15:33:29 +0000
+++ hooks/utils.py	2014-04-15 14:24:45 +0000
@@ -606,21 +606,18 @@
             revision = revision[1:]
             # We have to unshallow the checkout in order to be able to 'see'
             # older commit hashes to check them out.
+            # Note that "git fetch --unshallow" was introduced after precise.
             cmd_log(run(
                 'git', '--git-dir', git_dir, '--work-tree',
                 juju_gui_source_dir, 'fetch', '--depth', '20000'))
-
-            cmd_log(run(
-                'git', '--git-dir', git_dir, '--work-tree',
-                juju_gui_source_dir, 'checkout', revision))
         else:
             cmd_log(run(
                 'git', '--git-dir', git_dir, '--work-tree',
-                juju_gui_source_dir, 'fetch', 'origin'))
-            cmd_log(run(
-                'git', '--git-dir', git_dir, '--work-tree',
-                juju_gui_source_dir, 'checkout', '-b', revision,
-                'origin/' + revision))
+                juju_gui_source_dir, 'fetch', '--depth', '1',
+                'origin', '{0}:{0}'.format(revision)))
+        cmd_log(run(
+            'git', '--git-dir', git_dir, '--work-tree',
+            juju_gui_source_dir, 'checkout', revision))
 
     log('Preparing a Juju GUI release.')
     logdir = os.path.dirname(logpath)

=== modified file 'revision'
--- revision	2014-04-09 13:16:08 +0000
+++ revision	2014-04-15 14:24:45 +0000
@@ -1,1 +1,1 @@
-110
+111

=== modified file 'tests/20-functional.test'
--- tests/20-functional.test	2014-02-27 21:02:33 +0000
+++ tests/20-functional.test	2014-04-15 14:24:45 +0000
@@ -35,6 +35,7 @@
 from helpers import (
     get_admin_secret,
     juju_destroy_service,
+    juju_status,
     make_service_name,
     WebSocketClient,
 )
@@ -47,31 +48,22 @@
 except ValueError as err:
     admin_secret = None
     print(err)
+bootstrap_node_series = juju_status()['machines']['0']['series']
 
 
 def juju_deploy_gui(options=None):
     """Deploy the Juju GUI charm with the given options.
 
-    Deploy the charm in the bootstrap node if possible in the current Juju
-    implementation. Use a random service name.
+    Deploy the charm in the bootstrap node, using the bootstrap node series
+    and giving to the resulting service a random name.
 
-    Return a tuple containing the deployed service name, unit info and a list
-    of services that are started in the Juju GUI unit and that must be
-    manually stopped by tests. In juju-core, the services list is always empty.
+    Return a tuple containing the deployed service name and unit info.
     """
     service_name = make_service_name(prefix='juju-gui-')
     unit_info = juju_deploy(
         'juju-gui', service_name=service_name, options=options,
-        force_machine=0)
-    cleanup_services = []
-    if options is None:
-        options = {}
-    # Either stop the builtin server or the old apache2/haproxy setup.
-    if options.get('builtin-server') == 'true':
-        cleanup_services.append('guiserver')
-    else:
-        cleanup_services.extend(['haproxy', 'apache2'])
-    return service_name, unit_info, cleanup_services
+        force_machine=0, series=bootstrap_node_series)
+    return service_name, unit_info
 
 
 class DeployTestMixin(object):
@@ -176,7 +168,7 @@
 
     def test_stable_release(self):
         # Ensure the stable Juju GUI release is correctly set up.
-        self.service_name, unit_info, _ = juju_deploy_gui(
+        self.service_name, unit_info = juju_deploy_gui(
             options={'juju-gui-source': 'stable'})
         hostname = unit_info['public-address']
         self.navigate_to(hostname)
@@ -185,7 +177,7 @@
 
     def test_sandbox(self):
         # The GUI is correctly deployed and set up in sandbox mode.
-        self.service_name, unit_info, _ = juju_deploy_gui(
+        self.service_name, unit_info = juju_deploy_gui(
             options={'sandbox': 'true'})
         hostname = unit_info['public-address']
         self.navigate_to(hostname)
@@ -198,16 +190,19 @@
     def test_branch_source(self):
         # Ensure the Juju GUI is correctly deployed from a Git branch.
         options = {'juju-gui-source': JUJU_GUI_TEST_BRANCH}
-        self.service_name, unit_info, _ = juju_deploy_gui(options=options)
+        self.service_name, unit_info = juju_deploy_gui(options=options)
         hostname = unit_info['public-address']
         self.navigate_to(hostname)
         self.handle_browser_warning()
         self.assertEnvironmentIsConnected()
 
+    @unittest.skipUnless(
+        bootstrap_node_series == 'precise',
+        'the legacy server is only supported on precise')
     def test_legacy_server(self):
         # The legacy apache + haproxy server configuration works correctly.
         # Also make sure the correct cache headers are sent.
-        self.service_name, unit_info, _ = juju_deploy_gui(
+        self.service_name, unit_info = juju_deploy_gui(
             options={'builtin-server': 'false'})
         hostname = unit_info['public-address']
         self.navigate_to(hostname)
@@ -232,7 +227,7 @@
     def setUpClass(cls):
         # Deploy the charm. The resulting service is used by all the tests
         # in this test case.
-        cls.service_name, unit_info, cls.cleanup_services = juju_deploy_gui()
+        cls.service_name, unit_info = juju_deploy_gui()
         cls.hostname = unit_info['public-address']
         # The counter is used to produce API request identifiers.
         cls.counter = itertools.count()

=== modified file 'tests/deploy.py'
--- tests/deploy.py	2014-01-16 19:25:52 +0000
+++ tests/deploy.py	2014-04-15 14:24:45 +0000
@@ -57,7 +57,7 @@
 
 def juju_deploy(
         charm_name, service_name=None, options=None, force_machine=None,
-        charm_source=None, series='precise'):
+        charm_source=None, series=None):
     """Deploy and expose the charm. Return the first unit's public address.
 
     Also wait until the service is exposed and the first unit started.
@@ -66,12 +66,16 @@
     If options are provided, they will be used when deploying the charm.
     If force_machine is not None, create the unit in the specified machine.
     If charm_source is None, dynamically retrieve the charm source directory.
+    If series is None, the series specified in the SERIES environment variable
+    is used if found, defaulting to "precise".
     """
     # Note: this function is used by both the functional tests and
     # "make deploy": see the "if main" section below.
     if charm_source is None:
         # Dynamically retrieve the charm source based on the path of this file.
         charm_source = os.path.join(os.path.dirname(__file__), '..')
+    if series is None:
+        series = os.getenv('SERIES', '').strip() or 'precise'
     logging.debug('setting up the charms repository')
     repo = setup_repository(charm_name, charm_source, series=series)
     args = ['deploy', '--repository', repo]