Merge lp:~cprov/uci-engine/gk-ubuntucore into lp:uci-engine

[Celso Providelo]

Extends the common (ci-airline) Gatekeeper service to traverse ubuntucore test results containers (ubuntucore-<'current'|<image|tr ID>>) under <GK>/ubuntucore/<ID> and wire up Apache.

TL;DR: Feel free to ignore me because it's not relevant for the first story checkpoint.

Extends the common (ci-airline) Gatekeeper service to traverse ubuntucore test results containers (ubuntucore-<'current'|<image|tr ID>>) under <GK>/ubuntucore/<ID>.

Also wire up ubuntucore-webui-apache to proxy requests to GK on:

* / -> <GK>/ubuntucore/current
* /<ID> -> <GK>/ubuntucore/<ID> (suffices for browsing if we propagate the image ID)

GK currently renders a very simple HTML with links to swift tempurls for objects inside the test result container (pass|failed and 'tarball'). Until now no template library was necessary, but if we have to get a little more sophisticated, that might be required.

We can actually deploy ci-ubuntucore (`deploy.py --name ci-ubuntucore`) and create test result containers manually (`swift upload ubuntucore-current xxx`).

Unmerged revisions

928. By Celso Providelo on 2015-01-14

typo

927. By Celso Providelo on 2015-01-14

Rendering links (tempurls) to results container objects.

926. By Celso Providelo on 2015-01-14

Deploy and test GK in ci-ubuntucore.

925. By Celso Providelo on 2015-01-14

Improving test result page.

924. By Celso Providelo on 2015-01-14

Implementing and activating UbuntuCoreResource (/ubuntucore/<id>).

923. By Celso Providelo on 2015-01-14

Implementing support for retriving ubuntucore container from the datastore.

922. By Celso Providelo on 2015-01-14

Splitting and generalising GK datastore container model.

=== modified file 'gatekeeper/gatekeeper/datastore/__init__.py'
--- gatekeeper/gatekeeper/datastore/__init__.py	2014-10-07 10:04:01 +0000
+++ gatekeeper/gatekeeper/datastore/__init__.py	2015-01-14 23:23:47 +0000
@@ -18,8 +18,9 @@
 from base import BasicDataStore
 from sandbox import SupervisedSandboxesMixin
 from ticket import TicketContainerMixin
+from ubuntucore import UbuntuCoreContainerMixin
 
 
 class DataStore(SupervisedSandboxesMixin, TicketContainerMixin,
-                BasicDataStore):
+                UbuntuCoreContainerMixin, BasicDataStore):
     """Swift data store utility."""

=== added file 'gatekeeper/gatekeeper/datastore/container.py'
--- gatekeeper/gatekeeper/datastore/container.py	1970-01-01 00:00:00 +0000
+++ gatekeeper/gatekeeper/datastore/container.py	2015-01-14 23:23:47 +0000
@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+# Ubuntu CI Engine
+# Copyright 2014, 2015 Canonical Ltd.
+
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License version 3, as
+# published by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""Swift container model."""
+from __future__ import unicode_literals
+
+import uuid
+
+from swiftclient import client
+
+from ci_utils import unit_config
+from tempurl import (
+    OSTempUrlProvider,
+    HPTempUrlProvider,
+)
+
+
+class Container(object):
+    """Swift container utility with tempurl support. """
+
+    def __init__(self, url, token, options, **kwargs):
+        self.url = url
+        self.token = token
+        self.options = options
+        self.name = kwargs.get('name')
+        self.size = kwargs.get('bytes')
+        self.count = kwargs.get('count')
+
+    def __unicode__(self):
+        return self.name
+
+    def _get_tempurl_key(self):
+        """Local wrapper to UUID for facilitating tests."""
+        return str(uuid.uuid1())
+
+    def _get_tempurl_provider(self):
+        """Return the tempurl provider appropriate for this context."""
+        if unit_config.is_hpcloud(self.options.auth_url):
+            return HPTempUrlProvider(self.url, self.token, self.options)
+        return OSTempUrlProvider(self.url, self.token, self.options)
+
+    def get_objects_tempurls(self, method='GET'):
+        """Return a tempurls for objects for the given method."""
+        provider = self._get_tempurl_provider()
+        provider.set_temp_key(self._get_tempurl_key())
+        header, contents = client.get_container(
+            self.url, self.token, self.name)
+        results = []
+        for content in contents:
+            object_name = content['name']
+            temp_url = provider.get_temp_url(
+                self.name, object_name, method=method)
+            results.append((object_name, temp_url))
+        return dict(results)

=== added file 'gatekeeper/gatekeeper/datastore/tests/test_container.py'
--- gatekeeper/gatekeeper/datastore/tests/test_container.py	1970-01-01 00:00:00 +0000
+++ gatekeeper/gatekeeper/datastore/tests/test_container.py	2015-01-14 23:23:47 +0000
@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+# Ubuntu CI Engine
+# Copyright 2014, 2015 Canonical Ltd.
+
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License version 3, as
+# published by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""Swift datastore container tests."""
+from __future__ import unicode_literals
+
+from mock import patch
+import unittest
+
+from gatekeeper.datastore.tests import FakeOptions
+from gatekeeper.datastore.container import Container
+
+
+class TestContainer(unittest.TestCase):
+    """Tests for `Container`."""
+
+    def setUp(self):
+        # Creates a sample `Container`.
+        super(TestContainer, self).setUp()
+        contents = {
+            'name': 'ticket-3',
+            'bytes': 17,
+            'count': 1,
+        }
+        self.url = 'http://fake.com/AUTH_1234'
+        self.token = '4321'
+        self.options = FakeOptions()
+        self.container = Container(
+            self.url, self.token, self.options, **contents)
+
+    def test_representation(self):
+        # `TicketContainer` representation and base attributes.
+        self.assertEquals('ticket-3', unicode(self.container))
+        self.assertEquals('ticket-3', self.container.name)
+        self.assertEquals(17, self.container.size)
+        self.assertEquals(1, self.container.count)
+
+    @patch('swiftclient.client.post_account')
+    @patch('time.time')
+    @patch('gatekeeper.datastore.ticket.Container._get_tempurl_key')
+    @patch('swiftclient.client.get_container')
+    def test_get_objects_tempurls(self, mocked_container, mocked_key,
+                                  mocked_time, mocked_post):
+        # `TicketContainer.get_objects_tempurls` returns a dictionary
+        # keyed by the ticket objects (artifacts) names and their
+        # corresponding tempurls (for GET) as values.
+        mocked_container.return_value = (
+            'ignored', [{'name': 'one'}, {'name': 'two'}])
+        mocked_key.return_value = b'02c5fc18-ca73-11e3-88d9-001c4229f9ac'
+        mocked_time.return_value = 1397702769
+
+        self.assertEquals(
+            {'one': 'http://fake.com/v1/AUTH_1234/ticket-3/one?'
+                    'temp_url_sig=5de01a1853ae94eb824d4c12d2d1dafb0d4f1000&'
+                    'temp_url_expires=1397703069',
+             'two': 'http://fake.com/v1/AUTH_1234/ticket-3/two?'
+                    'temp_url_sig=27a61b0817e51fdd1a64ca2d71d98d6d4a1adebf&'
+                    'temp_url_expires=1397703069'},
+            self.container.get_objects_tempurls())

=== modified file 'gatekeeper/gatekeeper/datastore/tests/test_ticket.py'
--- gatekeeper/gatekeeper/datastore/tests/test_ticket.py	2014-10-07 10:04:01 +0000
+++ gatekeeper/gatekeeper/datastore/tests/test_ticket.py	2015-01-14 23:23:47 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Ubuntu CI Engine
-# Copyright 2014 Canonical Ltd.
+# Copyright 2014, 2015 Canonical Ltd.
 
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3, as
@@ -19,62 +19,14 @@
 from mock import patch
 import unittest
 
+from gatekeeper.datastore.container import Container
 from gatekeeper.datastore.tests import FakeOptions
 from gatekeeper.datastore.ticket import (
-    TicketContainer,
     TicketContainerNotFound,
     TicketContainerMixin,
 )
 
 
-class TestTicketContainer(unittest.TestCase):
-    """Tests for `TicketContainer`."""
-
-    def setUp(self):
-        # Creates a sample `TicketContainer`.
-        super(TestTicketContainer, self).setUp()
-        contents = {
-            'name': 'ticket-3',
-            'bytes': 17,
-            'count': 1,
-        }
-        self.url = 'http://fake.com/AUTH_1234'
-        self.token = '4321'
-        self.options = FakeOptions()
-        self.container = TicketContainer(
-            self.url, self.token, self.options, **contents)
-
-    def test_representation(self):
-        # `TicketContainer` representation and base attributes.
-        self.assertEquals('ticket-3', unicode(self.container))
-        self.assertEquals('ticket-3', self.container.name)
-        self.assertEquals(17, self.container.size)
-        self.assertEquals(1, self.container.count)
-
-    @patch('swiftclient.client.post_account')
-    @patch('time.time')
-    @patch('gatekeeper.datastore.ticket.TicketContainer._get_tempurl_key')
-    @patch('swiftclient.client.get_container')
-    def test_get_objects_tempurls(self, mocked_container, mocked_key,
-                                  mocked_time, mocked_post):
-        # `TicketContainer.get_objects_tempurls` returns a dictionary
-        # keyed by the ticket objects (artifacts) names and their
-        # corresponding tempurls (for GET) as values.
-        mocked_container.return_value = (
-            'ignored', [{'name': 'one'}, {'name': 'two'}])
-        mocked_key.return_value = b'02c5fc18-ca73-11e3-88d9-001c4229f9ac'
-        mocked_time.return_value = 1397702769
-
-        self.assertEquals(
-            {'one': 'http://fake.com/v1/AUTH_1234/ticket-3/one?'
-                    'temp_url_sig=5de01a1853ae94eb824d4c12d2d1dafb0d4f1000&'
-                    'temp_url_expires=1397703069',
-             'two': 'http://fake.com/v1/AUTH_1234/ticket-3/two?'
-                    'temp_url_sig=27a61b0817e51fdd1a64ca2d71d98d6d4a1adebf&'
-                    'temp_url_expires=1397703069'},
-            self.container.get_objects_tempurls())
-
-
 class TestTicketContainerMixin(unittest.TestCase):
     """Tests for `TicketContainerMixin`."""
 
@@ -94,7 +46,7 @@
         container = self.mixin.get_ticket_container('9')
         mocked_account.assert_called_once_with(
             self.mixin.url, self.mixin.token, prefix='ticket-9')
-        self.assertIsInstance(container, TicketContainer)
+        self.assertIsInstance(container, Container)
         self.assertEquals('ticket-9', container.name)
         self.assertEquals(0, container.size)
         self.assertEquals(0, container.count)

=== added file 'gatekeeper/gatekeeper/datastore/tests/test_ubuntucore.py'
--- gatekeeper/gatekeeper/datastore/tests/test_ubuntucore.py	1970-01-01 00:00:00 +0000
+++ gatekeeper/gatekeeper/datastore/tests/test_ubuntucore.py	2015-01-14 23:23:47 +0000
@@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+# Ubuntu CI Engine
+# Copyright 2014, 2015 Canonical Ltd.
+
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License version 3, as
+# published by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""Swift datastore ubuntucore test result container mixin tests."""
+from __future__ import unicode_literals
+
+from mock import patch
+import unittest
+
+from gatekeeper.datastore.container import Container
+from gatekeeper.datastore.tests import FakeOptions
+from gatekeeper.datastore.ubuntucore import (
+    UbuntuCoreContainerMixin,
+    UbuntuCoreContainerNotFound,
+)
+
+
+class TestUbuntuCoreContainerMixin(unittest.TestCase):
+    """Tests for `UbuntuCoreContainerMixin`."""
+
+    def setUp(self):
+        # Creates a sample `UbuntuCoreContainerMixin` object.
+        super(TestUbuntuCoreContainerMixin, self).setUp()
+        self.mixin = UbuntuCoreContainerMixin()
+        self.mixin.url = 'http://a-url'
+        self.mixin.token = 'a-token'
+        self.mixin.options = FakeOptions()
+
+    @patch('swiftclient.client.get_account')
+    def test_get_container(self, mocked_account):
+        # `UbuntuCoreContainerMixin` implements a test result container
+        # getter.
+        mocked_account.return_value = (
+            'ignored', [{'name': 'ubuntucore-9', 'bytes': 0, 'count': 0}])
+        container = self.mixin.get_ubuntucore_container('9')
+        mocked_account.assert_called_once_with(
+            self.mixin.url, self.mixin.token, prefix='ubuntucore-9')
+        self.assertIsInstance(container, Container)
+        self.assertEquals('ubuntucore-9', container.name)
+        self.assertEquals(0, container.size)
+        self.assertEquals(0, container.count)
+
+    @patch('swiftclient.client.get_account')
+    def test_get_container_missing(self, mocked_account):
+        # `UbuntuCoreContainerMixin.get_ubuntucore_container` raises
+        # `UbuntuCoreContainerNotFound` on missing test results.
+        mocked_account.return_value = ('ignored', [])
+        with self.assertRaises(UbuntuCoreContainerNotFound):
+            self.mixin.get_ubuntucore_container('10')
+        mocked_account.assert_called_once_with(
+            self.mixin.url, self.mixin.token, prefix='ubuntucore-10')
+
+    @patch('swiftclient.client.get_account')
+    def test_get_container_exact(self, mocked_account):
+        # `UbuntuCoreContainerMixin` getter only returns exact matches.
+        mocked_account.return_value = (
+            'ignored', [{'name': 'ubuntucore-9999', 'bytes': 0, 'count': 0}])
+        with self.assertRaises(UbuntuCoreContainerNotFound):
+            self.mixin.get_ubuntucore_container('9')
+        mocked_account.assert_called_once_with(
+            self.mixin.url, self.mixin.token, prefix='ubuntucore-9')

=== modified file 'gatekeeper/gatekeeper/datastore/ticket.py'
--- gatekeeper/gatekeeper/datastore/ticket.py	2014-10-31 14:26:27 +0000
+++ gatekeeper/gatekeeper/datastore/ticket.py	2015-01-14 23:23:47 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Ubuntu CI Engine
-# Copyright 2014 Canonical Ltd.
+# Copyright 2014, 2015 Canonical Ltd.
 
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3, as
@@ -13,68 +13,23 @@
 
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""Swift ticket container hanlder mixin."""
+"""Swift ticket container handler mixin."""
 from __future__ import unicode_literals
 
-import uuid
-
 from swiftclient import client
 
-from ci_utils import unit_config
-from tempurl import (
-    OSTempUrlProvider,
-    HPTempUrlProvider,
-)
+from gatekeeper.datastore.container import Container
 
 
 class TicketContainerNotFound(Exception):
     """Raised when a swift ticket container could not be found."""
 
 
-class TicketContainer(object):
-    """Swift ticket container utility with tempurl support. """
-
-    def __init__(self, url, token, options, **kwargs):
-        self.url = url
-        self.token = token
-        self.options = options
-        self.name = kwargs.get('name')
-        self.size = kwargs.get('bytes')
-        self.count = kwargs.get('count')
-
-    def __unicode__(self):
-        return self.name
-
-    def _get_tempurl_key(self):
-        """Local wrapper to UUID for facilitating tests."""
-        return str(uuid.uuid1())
-
-    def _get_tempurl_provider(self):
-        """Return the tempurl provider appropriate for this context."""
-        if unit_config.is_hpcloud(self.options.auth_url):
-            return HPTempUrlProvider(self.url, self.token, self.options)
-        return OSTempUrlProvider(self.url, self.token, self.options)
-
-    def get_objects_tempurls(self, method='GET'):
-        """Return a tempurls for objects for the given method."""
-        provider = self._get_tempurl_provider()
-        provider.set_temp_key(self._get_tempurl_key())
-        header, contents = client.get_container(
-            self.url, self.token, self.name)
-        results = []
-        for content in contents:
-            object_name = content['name']
-            temp_url = provider.get_temp_url(
-                self.name, object_name, method=method)
-            results.append((object_name, temp_url))
-        return dict(results)
-
-
 class TicketContainerMixin(object):
     """Swift datastore mixin for ticket container utility."""
 
     def get_ticket_container(self, ticket_id):
-        """Return a corresponding `TicketContainer`.
+        """Return the corresponding `Container`.
 
         Raises `TicketContainerNotFound` if it could not be found.
         """
@@ -87,5 +42,5 @@
             raise TicketContainerNotFound()
         if contents[0].get('name') != container_name:
             raise TicketContainerNotFound()
-        return TicketContainer(
+        return Container(
             self.url, self.token, self.options, **contents[0])

=== added file 'gatekeeper/gatekeeper/datastore/ubuntucore.py'
--- gatekeeper/gatekeeper/datastore/ubuntucore.py	1970-01-01 00:00:00 +0000
+++ gatekeeper/gatekeeper/datastore/ubuntucore.py	2015-01-14 23:23:47 +0000
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+# Ubuntu CI Engine
+# Copyright 2014, 2015 Canonical Ltd.
+
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License version 3, as
+# published by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""Swift ubuntucore testing results container handler mixin."""
+from __future__ import unicode_literals
+
+from swiftclient import client
+
+from gatekeeper.datastore.container import Container
+
+
+class UbuntuCoreContainerNotFound(Exception):
+    """Raised when a swift test result container couldn't be found."""
+
+
+class UbuntuCoreContainerMixin(object):
+    """Swift datastore mixin for ubuntucore container utility."""
+
+    def get_ubuntucore_container(self, result_id):
+        """Return the corresponding `Container`.
+
+        Raises `UbuntuCoreContainerNotFound` if it could not be found.
+        """
+        if not result_id:
+            raise UbuntuCoreContainerNotFound()
+        container_name = 'ubuntucore-{}'.format(result_id)
+        headers, contents = client.get_account(
+            self.url, self.token, prefix=container_name)
+        if len(contents) == 0:
+            raise UbuntuCoreContainerNotFound()
+        if contents[0].get('name') != container_name:
+            raise UbuntuCoreContainerNotFound()
+        return Container(
+            self.url, self.token, self.options, **contents[0])

=== modified file 'gatekeeper/gatekeeper/resources/root.py'
--- gatekeeper/gatekeeper/resources/root.py	2014-04-26 00:03:31 +0000
+++ gatekeeper/gatekeeper/resources/root.py	2015-01-14 23:23:47 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Ubuntu CI Engine
-# Copyright 2014 Canonical Ltd.
+# Copyright 2014, 2015 Canonical Ltd.
 
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3, as
@@ -16,11 +16,16 @@
 """Restish root resource."""
 from __future__ import unicode_literals
 
-from restish import resource
+from restish import (
+    http,
+    resource,
+)
 from restish.app import RestishApp
 
+from gatekeeper.datastore.ubuntucore import UbuntuCoreContainerNotFound
 from gatekeeper.resources import GatekeeperResource
 from gatekeeper.resources.v1 import API as v1_api
+from gatekeeper.resources.ubuntucore import UbuntuCoreResource
 
 
 class Root(GatekeeperResource):
@@ -31,6 +36,14 @@
         self.logger.debug('[api]: %s %s', request.url, str(segments))
         return v1_api()
 
+    @resource.child('ubuntucore/{result_id}')
+    def ubuntucore_wrapper(self, request, segments, result_id):
+        try:
+            self.datastore.get_ubuntucore_container(result_id)
+        except UbuntuCoreContainerNotFound:
+            return http.not_found()
+        return UbuntuCoreResource(result_id)
+
 
 def make_app(datastore_factory):
     """Build the wsgi app object with the given datastore factory."""

=== added file 'gatekeeper/gatekeeper/resources/tests/test_ubuntucore.py'
--- gatekeeper/gatekeeper/resources/tests/test_ubuntucore.py	1970-01-01 00:00:00 +0000
+++ gatekeeper/gatekeeper/resources/tests/test_ubuntucore.py	2015-01-14 23:23:47 +0000
@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+# Ubuntu CI Engine
+# Copyright 2014, 2015 Canonical Ltd.
+
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License version 3, as
+# published by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""UbuntuCore test suite."""
+from __future__ import unicode_literals
+
+from testtools import TestCase
+from webtest import TestApp
+
+from gatekeeper.datastore.ubuntucore import UbuntuCoreContainerNotFound
+from gatekeeper.resources.root import make_app
+
+
+class FakeUbuntuCoreContainer(object):
+
+    def get_objects_tempurls(self):
+        return {
+            'pass': 'http://pass_temp_url',
+            'tarball': 'http://tarball_temp_url',
+        }
+
+
+class FakeDataStore(object):
+
+    def get_ubuntucore_container(self, result_id):
+        if result_id in ['', '1000']:
+            raise UbuntuCoreContainerNotFound()
+        return FakeUbuntuCoreContainer()
+
+
+def fake_datastore_factory(klass):
+    return FakeDataStore()
+
+
+class TestUbuntuCoreResource(TestCase):
+    """UbuntuCore resource tests."""
+
+    def setUp(self):
+        # Run the restful server.
+        super(TestUbuntuCoreResource, self).setUp()
+        wsgi_app = make_app(fake_datastore_factory)
+        self.app = TestApp(wsgi_app, relative_to='.')
+
+    def test_get_not_found(self):
+        # Empty GET on ubuntucore/ or pointing to an absent ID returns 404.
+        self.app.get('/ubuntucore/', status=404)
+        self.app.get('/ubuntucore/1000/', status=404)
+
+    def test_get_returns_test_result_html(self):
+        # GET on a ubuntucore result_id URL returns
+        # Since tempurls expires, this page should not be cached in browsers.
+        resp = self.app.get('/ubuntucore/1')
+        self.assertEqual(200, resp.status_code, resp.body)
+        self.assertEqual(
+            'max-age=0, no-cache', str(resp.cache_control))
+        self.assertEqual('text/html', resp.content_type)
+        self.assertEqual([
+            '<html>',
+            '<head>',
+            '<title>UbuntuCore results for 1</title>',
+            '</head>',
+            '<body>',
+            '<h1>UbuntuCore results for 1</h1>',
+            '<ul>',
+            '<li><a href="http://pass_temp_url">pass</a></li>',
+            '<li><a href="http://tarball_temp_url">tarball</a></li>',
+            '</ul>',
+            '</body>',
+            '</html>'
+        ], resp.body.splitlines())
+
+    def test_other_methods_not_allowed(self):
+        # POST, PUT and DELETE are not allowed.
+        self.app.post('/ubuntucore/1', status=405)
+        self.app.put('/ubuntucore/1', status=405)
+        self.app.delete('/ubuntucore/1', status=405)

=== added file 'gatekeeper/gatekeeper/resources/ubuntucore.py'
--- gatekeeper/gatekeeper/resources/ubuntucore.py	1970-01-01 00:00:00 +0000
+++ gatekeeper/gatekeeper/resources/ubuntucore.py	2015-01-14 23:23:47 +0000
@@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+# Ubuntu CI Engine
+# Copyright 2014, 2015 Canonical Ltd.
+
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License version 3, as
+# published by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""UbuntuCore service resource."""
+from __future__ import unicode_literals
+
+from restish import (
+    http,
+    resource,
+)
+
+from gatekeeper.datastore.ubuntucore import UbuntuCoreContainerNotFound
+from gatekeeper.resources import GatekeeperResource
+
+
+class UbuntuCoreResource(GatekeeperResource):
+    """UbuntuCore service resource.
+
+    - GET '/{'current'|<result_id>}' -> returns a simple HTML page presenting
+      the results.
+    """
+
+    def __init__(self, result_id):
+        super(UbuntuCoreResource, self).__init__()
+        self.result_id = result_id
+
+    @resource.GET()
+    def contents(self, request):
+        try:
+            container = self.datastore.get_ubuntucore_container(
+                self.result_id)
+        except UbuntuCoreContainerNotFound:
+            return http.not_found()
+        # XXX cprov 20140114: expand details presented according to
+        # the customer story specification.
+        obj_list = ['<ul>']
+        tempurls = container.get_objects_tempurls()
+        for k, v in sorted(tempurls.items()):
+            obj_list.append('<li><a href="{}">{}</a></li>'.format(v, k))
+        obj_list.append('</ul>')
+        context = {
+            'result_id': self.result_id,
+            'obj_list': '\n'.join(obj_list),
+        }
+        payload = '\n'.join([
+            '<html>',
+            '<head>',
+            '<title>UbuntuCore results for {result_id}</title>',
+            '</head>',
+            '<body>',
+            '<h1>UbuntuCore results for {result_id}</h1>',
+            '{obj_list}',
+            '</body>',
+            '</html>',
+        ]).format(**context)
+
+        headers = [
+            (b'Cache-Control', 'max-age=0, no-cache'),
+            (b'Content-Type', b'text/html; charset=utf-8')
+        ]
+        return http.ok(headers, str(payload))

=== added file 'juju-deployer/configs/ubuntucore_http_vhost'
--- juju-deployer/configs/ubuntucore_http_vhost	1970-01-01 00:00:00 +0000
+++ juju-deployer/configs/ubuntucore_http_vhost	2015-01-14 23:23:47 +0000
@@ -0,0 +1,18 @@
+<VirtualHost *:80>
+  ServerAdmin [e-mail]
+  ErrorLog ${APACHE_LOG_DIR}/webui-error.log
+  LogLevel warn
+  CustomLog ${APACHE_LOG_DIR}/webui-access.log combined
+
+  DocumentRoot /var/www
+
+  <Directory />
+    Options FollowSymLinks
+    AllowOverride None
+  </Directory>
+
+  RewriteEngine on
+  Include /etc/apache2/juju-*.conf
+  RewriteRule ^/$ http://{{ ciairlinegatekeeperrestish }}/ubuntucore/current [P]
+  RewriteRule ^/(.*)$ http://{{ ciairlinegatekeeperrestish }}/ubuntucore/$1 [P]
+</VirtualHost>

=== modified file 'juju-deployer/relations.yaml'
--- juju-deployer/relations.yaml	2015-01-13 17:44:27 +0000
+++ juju-deployer/relations.yaml	2015-01-14 23:23:47 +0000
@@ -121,3 +121,13 @@
 
 ci-ubuntucore:
     inherits: common
+    services:
+        ci-ubuntucore-webui-apache:
+            charm: apache2
+        ci-airline-gatekeeper-restish:
+            charm: uci-engine-wsgi-app
+        ci-airline-gatekeeper-gunicorn:
+            charm: gunicorn
+    relations:
+        - ["ci-airline-gatekeeper-restish:wsgi", "ci-airline-gatekeeper-gunicorn:wsgi-file"]
+        - ["ci-airline-gatekeeper-restish:website", "ci-ubuntucore-webui-apache:reverseproxy"]

=== modified file 'juju-deployer/services.yaml.tmpl'
--- juju-deployer/services.yaml.tmpl	2015-01-13 17:44:27 +0000
+++ juju-deployer/services.yaml.tmpl	2015-01-14 23:23:47 +0000
@@ -428,5 +428,35 @@
             branch: lp:charms/precise/apache2@54
             options:
                 enable_modules: "rewrite proxy proxy_http ssl"
-                servername: ci_ubuntu_core_webui_apache
+                vhost_http_template: include-base64://configs/ubuntucore_http_vhost
+                servername: ci_ubuntucore_webui_apache
             expose: true
+        ci-airline-gatekeeper-restish:
+            expose: False
+            branch: lp:~canonical-ci-engineering/charms/precise/uci-engine-wsgi-app/trunk@2
+            charm: uci-engine-wsgi-app
+            constraints: "mem=1024M"
+            options:
+                current_code: ${CI_PAYLOAD_URL}
+                available_code: ${CI_PAYLOAD_URL}
+                python_path: ./gatekeeper:./ci-utils
+                packages: "python-swiftclient python-tz python-dput python-gnupg"
+                unit-config: include-base64://configs/unit_config.yaml
+                json_status_path: api/v1/status
+                install_sources: |
+                    - ${CI_PPA}
+                install_keys: |
+                    - null
+                nagios_check_http_params: -H gatekeeper -I 127.0.0.1 -e '
+                    200 OK' --url='/api/v1/' -p 8080
+                nagios_check_health_params: -t 120 gatekeeper.health
+                nagios_context: ci-airline-staging
+                cron_cmd: ./run-python ./gatekeeper/bin/check_gatekeeper.py
+                cron_schedule: "* * * * *"
+        ci-airline-gatekeeper-gunicorn:
+            charm: gunicorn
+            branch: lp:charms/gunicorn@30
+            options:
+                wsgi_wsgi_file: gatekeeper.wsgi:app
+                wsgi_log_level: DEBUG
+                wsgi_timeout: 60

=== added file 'tests/test_ubuntucore.py'
--- tests/test_ubuntucore.py	1970-01-01 00:00:00 +0000
+++ tests/test_ubuntucore.py	2015-01-14 23:23:47 +0000
@@ -0,0 +1,119 @@
+#!/usr/bin/env python
+# Ubuntu Continuous Integration Engine
+# Copyright 2015 Canonical Ltd.
+
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License version 3, as
+# published by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+from __future__ import unicode_literals
+
+import unittest
+
+from sst.actions import (
+    assert_title,
+    go_to,
+    get_element,
+    get_elements,
+    get_link_url,
+    set_base_url,
+    set_window_size,
+)
+from sst import (
+    browsers,
+    cases,
+)
+
+from gatekeeper.datastore import DataStore
+from gatekeeper.datastore.options import DataStoreOptions
+from swiftclient import client
+
+import deployers
+
+
+class UbuntuCoreWebUITest(cases.SSTTestCase):
+
+    browser_factory = browsers.PhantomJSFactory()
+
+    def setUp(self):
+        """Sets browser base_url based on the available deployment."""
+        super(UbuntuCoreWebUITest, self).setUp()
+        try:
+            set_base_url('http://{}/'.format(
+                deployers.juju_get_ip_and_port(
+                    'ci-ubuntucore-webui-apache')[0]))
+        except KeyError:
+            self.skipTest('UbuntuCore WebUI not available')
+        set_window_size(1280, 1024)
+        self._reset_containers()
+
+    def _reset_containers(self):
+        """Ensure swift containers expected by tests exist."""
+        options = DataStoreOptions()
+        ds = DataStore(options)
+        client.put_container(ds.url, ds.token, 'ubuntucore-current')
+        client.put_object(ds.url, ds.token, 'ubuntucore-current', 'pass')
+        client.put_object(
+            ds.url, ds.token, 'ubuntucore-current', 'tarball_667')
+        client.put_container(ds.url, ds.token, 'ubuntucore-666')
+        client.put_object(ds.url, ds.token, 'ubuntucore-666', 'failed')
+        client.put_object(ds.url, ds.token, 'ubuntucore-666', 'tarball_666')
+
+    def get_object_links(self):
+        """Return all object links available in the page.
+
+        Currently, simply *all* links, but that might evolve to a dedicated
+        CSS class or something similar.
+        """
+        return get_elements(tag='a')
+
+    def assertObjLinksText(self, expected, links):
+        """Assert given links text match 'expected' list.
+
+        Links text list is sorted (alphabetically) before comparing.
+        """
+        self.assertEqual(expected, sorted([l.text for l in links]))
+
+    def assertTempurlLinks(self, links):
+        """Assert the given list of links are swift tempurl."""
+        for link in links:
+            url = get_link_url(link)
+            if (url is not None and
+                'temp_url_sig=' in url and
+                'temp_url_expires=' in url):
+                continue
+            self.fail(
+                "'{}' is not a tempurl link ({})".format(link.text, url))
+
+    def test_home(self):
+        # UbuntuCore home presents the contents of the 'current' test
+        # result container linking to its objects tempurls.
+        go_to('/')
+        assert_title('UbuntuCore results for current')
+        h1 = get_element(tag='h1')
+        self.assertEqual('UbuntuCore results for current', h1.text)
+        obj_links = self.get_object_links()
+        self.assertObjLinksText(['pass', 'tarball_667'], obj_links)
+        self.assertTempurlLinks(obj_links)
+
+    def test_specific_version(self):
+        # UbuntuCore webui allow navigation to a specific test result
+        # (image really) version.
+        go_to('/666')
+        assert_title('UbuntuCore results for 666')
+        h1 = get_element(tag='h1')
+        self.assertEqual('UbuntuCore results for 666', h1.text)
+        obj_links = self.get_object_links()
+        self.assertObjLinksText(['failed', 'tarball_666'], obj_links)
+        self.assertTempurlLinks(obj_links)
+
+
+if __name__ == "__main__":
+    unittest.main()

=== modified file 'tests/test_webui.py'
--- tests/test_webui.py	2015-01-13 17:44:27 +0000
+++ tests/test_webui.py	2015-01-14 23:23:47 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # Ubuntu Continuous Integration Engine
-# Copyright 2014 Canonical Ltd.
+# Copyright 2014, 2015 Canonical Ltd.
 
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3, as
@@ -538,26 +538,5 @@
         self.assertEqual('Engine health', active_link.text)
 
 
-class UbuntuCoreWebUITest(cases.SSTTestCase):
-
-    browser_factory = browsers.PhantomJSFactory()
-
-    def setUp(self):
-        """Sets browser base_url based on the available deployment."""
-        super(UbuntuCoreWebUITest, self).setUp()
-        try:
-            set_base_url('http://{}/'.format(
-                deployers.juju_get_ip_and_port(
-                    'ci-ubuntucore-webui-apache')[0]))
-        except KeyError:
-            self.skipTest('UbuntuCore WebUI not available')
-        set_window_size(1280, 1024)
-
-    def test_home(self):
-        # Placeholder test, since UbuntuCore apache is still unconfigured.
-        go_to('/')
-        assert_title('403 Forbidden')
-
-
 if __name__ == "__main__":
     unittest.main()