Merge ~ilasc/launchpad:webhook-livefs into launchpad:master

[Ioana Lasc]

Add Webhook for LiveFS builds

Added webhooks for LiveFS builds.

While open for review, I did notice a test failure at the end of my day in lp.code.scripts.tests.test_request_daily_builds.TestRequestDailyBuilds.test_request_daily_builds after running full test suite with the message: "ERROR - team-name-100107/snap-name-100108/arch-100021: permission denied for relation account"

Will investigate in the morning - wanted to make sure I get the tidying up and the MP open today.

[Colin Watson (cjwatson)]

This mostly LGTM, thanks! I had a few minor comments from a line-by-line review, but the "needs fixing" is mainly for correcting the feature flag.

(As discussed on IRC, the test failure was in fact from my fix-webhook-visibility-check branch that's a prerequisite of this one. Sorry about that.)

review: Needs Fixing

[Ioana Lasc (ilasc)]

Thanks Colin! This is now ready for review.

[Colin Watson (cjwatson)]

This looks good so far. There are just a couple of missing things:

 * We need a test that requesting a new build of a livefs triggers a webhook delivery. This should go in lp.soyuz.tests.test_livefs; you can borrow from lp.snappy.tests.test_snap.TestSnap.test_requestBuild_triggers_webhooks.

 * Deleting a livefs needs to delete its associated webhooks; and we need a test for that too. See lp.snappy.model.snap.Snap.destroySelf and lp.snappy.tests.test_snap.TestSnapDeleteWithBuilds.test_related_webhooks_deleted (the equivalent should end up in lp.soyuz.tests.test_livefs.TestLiveFS.test_related_webhooks_deleted, I think).

(The second of these isn't such a major issue because, unlike snaps, it isn't currently possible to delete a livefs that's ever had builds; but it would be theoretically possible to create a livefs, set up a webhook on it, manually tell LP to ping the webhook target, and then delete the livefs. Supporting this is only one extra line in LiveFS.destroySelf and maybe a dozen lines of tests, so we might as well.)

review: Approve

[Ioana Lasc (ilasc)]

Thank you Colin, comments were of great help as usual.

Addressed the 2 shortcomings. Ready for a final glance. Thank you!

[Colin Watson (cjwatson)]

review: Approve

diff --git a/database/schema/security.cfg b/database/schema/security.cfg
index b5d6071..a2071e8 100644
--- a/database/schema/security.cfg
+++ b/database/schema/security.cfg
@@ -2597,6 +2597,7 @@ public.branch                           = SELECT
 public.distribution                     = SELECT
 public.gitrepository                    = SELECT
 public.job                              = SELECT, UPDATE
+public.livefs                           = SELECT
 public.ociproject                       = SELECT
 public.ociprojectname                   = SELECT
 public.ociprojectseries                 = SELECT
diff --git a/lib/lp/services/webhooks/interfaces.py b/lib/lp/services/webhooks/interfaces.py
index e4533b7..8fe724e 100644
--- a/lib/lp/services/webhooks/interfaces.py
+++ b/lib/lp/services/webhooks/interfaces.py
@@ -75,6 +75,7 @@ from lp.services.webservice.apihelpers import (
 WEBHOOK_EVENT_TYPES = {
     "bzr:push:0.1": "Bazaar push",
     "git:push:0.1": "Git push",
+    "livefs:build:0.1": "Live filesystem build",
     "merge-proposal:0.1": "Merge proposal",
     "snap:build:0.1": "Snap build",
     }
diff --git a/lib/lp/services/webhooks/model.py b/lib/lp/services/webhooks/model.py
index 0c38e8e..440ce26 100644
--- a/lib/lp/services/webhooks/model.py
+++ b/lib/lp/services/webhooks/model.py
@@ -104,6 +104,9 @@ class Webhook(StormBase):
     snap_id = Int(name='snap')
     snap = Reference(snap_id, 'Snap.id')
 
+    livefs_id = Int(name='livefs')
+    livefs = Reference(livefs_id, 'LiveFS.id')
+
     registrant_id = Int(name='registrant', allow_none=False)
     registrant = Reference(registrant_id, 'Person.id')
     date_created = DateTime(tzinfo=utc, allow_none=False)
@@ -123,6 +126,8 @@ class Webhook(StormBase):
             return self.branch
         elif self.snap is not None:
             return self.snap
+        elif self.livefs is not None:
+            return self.livefs
         else:
             raise AssertionError("No target.")
 
@@ -177,6 +182,8 @@ class WebhookSet:
         from lp.code.interfaces.branch import IBranch
         from lp.code.interfaces.gitrepository import IGitRepository
         from lp.snappy.interfaces.snap import ISnap
+        from lp.soyuz.interfaces.livefs import ILiveFS
+
         hook = Webhook()
         if IGitRepository.providedBy(target):
             hook.git_repository = target
@@ -184,6 +191,8 @@ class WebhookSet:
             hook.branch = target
         elif ISnap.providedBy(target):
             hook.snap = target
+        elif ILiveFS.providedBy(target):
+            hook.livefs = target
         else:
             raise AssertionError("Unsupported target: %r" % (target,))
         hook.registrant = registrant
@@ -208,12 +217,16 @@ class WebhookSet:
         from lp.code.interfaces.branch import IBranch
         from lp.code.interfaces.gitrepository import IGitRepository
         from lp.snappy.interfaces.snap import ISnap
+        from lp.soyuz.interfaces.livefs import ILiveFS
+
         if IGitRepository.providedBy(target):
             target_filter = Webhook.git_repository == target
         elif IBranch.providedBy(target):
             target_filter = Webhook.branch == target
         elif ISnap.providedBy(target):
             target_filter = Webhook.snap == target
+        elif ILiveFS.providedBy(target):
+            target_filter = Webhook.livefs == target
         else:
             raise AssertionError("Unsupported target: %r" % (target,))
         return IStore(Webhook).find(Webhook, target_filter).order_by(
diff --git a/lib/lp/services/webhooks/tests/test_browser.py b/lib/lp/services/webhooks/tests/test_browser.py
index 22a4be7..13adc13 100644
--- a/lib/lp/services/webhooks/tests/test_browser.py
+++ b/lib/lp/services/webhooks/tests/test_browser.py
@@ -18,6 +18,10 @@ import transaction
 from lp.services.features.testing import FeatureFixture
 from lp.services.webapp.publisher import canonical_url
 from lp.snappy.interfaces.snapstoreclient import ISnapStoreClient
+from lp.soyuz.interfaces.livefs import (
+    LIVEFS_FEATURE_FLAG,
+    LIVEFS_WEBHOOKS_FEATURE_FLAG,
+    )
 from lp.testing import (
     login_person,
     record_two_runs,
@@ -25,10 +29,7 @@ from lp.testing import (
     )
 from lp.testing.fakemethod import FakeMethod
 from lp.testing.fixture import ZopeUtilityFixture
-from lp.testing.layers import (
-    DatabaseFunctionalLayer,
-    LaunchpadFunctionalLayer,
-    )
+from lp.testing.layers import DatabaseFunctionalLayer
 from lp.testing.matchers import HasQueryCount
 from lp.testing.pages import extract_text
 from lp.testing.views import create_view
@@ -109,6 +110,26 @@ class SnapTestHelpers:
         return [obj]
 
 
+class LiveFSTestHelpers:
+    event_type = "livefs:build:0.1"
+    expected_event_types = [
+        ("livefs:build:0.1", "Live filesystem build"),
+    ]
+
+    def setUp(self):
+        super(LiveFSTestHelpers, self).setUp()
+
+    def makeTarget(self):
+        self.useFixture(FeatureFixture({'webhooks.new.enabled': 'true',
+                                        LIVEFS_FEATURE_FLAG: "on",
+                                        LIVEFS_WEBHOOKS_FEATURE_FLAG: "on"}))
+        owner = self.factory.makePerson()
+        return self.factory.makeLiveFS(registrant=owner, owner=owner)
+
+    def getTraversalStack(self, obj):
+        return [obj]
+
+
 class WebhookTargetViewTestHelpers:
 
     def setUp(self):
@@ -195,14 +216,19 @@ class TestWebhooksViewGitRepository(
 
 class TestWebhooksViewBranch(
     TestWebhooksViewBase, BranchTestHelpers, TestCaseWithFactory):
-
     pass
 
 
 class TestWebhooksViewSnap(
     TestWebhooksViewBase, SnapTestHelpers, TestCaseWithFactory):
 
-    layer = LaunchpadFunctionalLayer
+    pass
+
+
+class TestWebhooksViewLiveFS(
+    TestWebhooksViewBase, LiveFSTestHelpers, TestCaseWithFactory):
+
+    pass
 
 
 class TestWebhookAddViewBase(WebhookTargetViewTestHelpers):
@@ -300,7 +326,13 @@ class TestWebhookAddViewBranch(
 class TestWebhookAddViewSnap(
     TestWebhookAddViewBase, SnapTestHelpers, TestCaseWithFactory):
 
-    layer = LaunchpadFunctionalLayer
+    pass
+
+
+class TestWebhookAddViewLiveFS(
+    TestWebhookAddViewBase, LiveFSTestHelpers, TestCaseWithFactory):
+
+    pass
 
 
 class WebhookViewTestHelpers:
@@ -405,6 +437,12 @@ class TestWebhookViewSnap(
     pass
 
 
+class TestWebhookViewLiveFS(
+    TestWebhookViewBase, LiveFSTestHelpers, TestCaseWithFactory):
+
+    pass
+
+
 class TestWebhookDeleteViewBase(WebhookViewTestHelpers):
 
     layer = DatabaseFunctionalLayer
@@ -455,3 +493,9 @@ class TestWebhookDeleteViewSnap(
     TestWebhookDeleteViewBase, SnapTestHelpers, TestCaseWithFactory):
 
     pass
+
+
+class TestWebhookDeleteViewLiveFS(
+    TestWebhookDeleteViewBase, LiveFSTestHelpers, TestCaseWithFactory):
+
+    pass
diff --git a/lib/lp/services/webhooks/tests/test_job.py b/lib/lp/services/webhooks/tests/test_job.py
index 260698c..762f7ff 100644
--- a/lib/lp/services/webhooks/tests/test_job.py
+++ b/lib/lp/services/webhooks/tests/test_job.py
@@ -60,6 +60,10 @@ from lp.services.webhooks.model import (
     WebhookJobType,
     )
 from lp.services.webhooks.testing import LogsScheduledWebhooks
+from lp.soyuz.interfaces.livefs import (
+    LIVEFS_FEATURE_FLAG,
+    LIVEFS_WEBHOOKS_FEATURE_FLAG,
+    )
 from lp.testing import (
     login_person,
     TestCaseWithFactory,
@@ -339,6 +343,17 @@ class TestWebhookDeliveryJob(TestCaseWithFactory):
             "<WebhookDeliveryJob for webhook %d on %r>" % (hook.id, snap),
             repr(job))
 
+    def test_livefs__repr__(self):
+        # `WebhookDeliveryJob` objects for livefs have an informative __repr__.
+        with FeatureFixture({LIVEFS_FEATURE_FLAG: "on",
+                             LIVEFS_WEBHOOKS_FEATURE_FLAG: "on"}):
+            livefs = self.factory.makeLiveFS()
+        hook = self.factory.makeWebhook(target=livefs)
+        job = WebhookDeliveryJob.create(hook, 'test', payload={'foo': 'bar'})
+        self.assertEqual(
+            "<WebhookDeliveryJob for webhook %d on %r>" % (hook.id, livefs),
+            repr(job))
+
     def test_short_lease_and_timeout(self):
         # Webhook jobs have a request timeout of 30 seconds, a celery
         # timeout of 45 seconds, and a lease of 60 seconds, to give
diff --git a/lib/lp/services/webhooks/tests/test_model.py b/lib/lp/services/webhooks/tests/test_model.py
index 41189e3..cd43758 100644
--- a/lib/lp/services/webhooks/tests/test_model.py
+++ b/lib/lp/services/webhooks/tests/test_model.py
@@ -15,6 +15,7 @@ from zope.security.proxy import removeSecurityProxy
 from lp.app.enums import InformationType
 from lp.registry.enums import BranchSharingPolicy
 from lp.services.database.interfaces import IStore
+from lp.services.features.testing import FeatureFixture
 from lp.services.webapp.authorization import check_permission
 from lp.services.webapp.snapshot import notify_modified
 from lp.services.webhooks.interfaces import IWebhookSet
@@ -22,6 +23,10 @@ from lp.services.webhooks.model import (
     WebhookJob,
     WebhookSet,
     )
+from lp.soyuz.interfaces.livefs import (
+    LIVEFS_FEATURE_FLAG,
+    LIVEFS_WEBHOOKS_FEATURE_FLAG,
+    )
 from lp.testing import (
     admin_logged_in,
     anonymous_logged_in,
@@ -395,3 +400,17 @@ class TestWebhookSetSnap(TestWebhookSetBase, TestCaseWithFactory):
         if owner is None:
             owner = self.factory.makePerson()
         return self.factory.makeSnap(registrant=owner, owner=owner, **kwargs)
+
+
+class TestWebhookSetLiveFS(TestWebhookSetBase, TestCaseWithFactory):
+
+    event_type = 'livefs:build:0.1'
+
+    def makeTarget(self, owner=None, **kwargs):
+        if owner is None:
+            owner = self.factory.makePerson()
+
+        with FeatureFixture({LIVEFS_FEATURE_FLAG: "on",
+                             LIVEFS_WEBHOOKS_FEATURE_FLAG: "on"}):
+            return self.factory.makeLiveFS(registrant=owner,
+                                           owner=owner, **kwargs)
diff --git a/lib/lp/services/webhooks/tests/test_webservice.py b/lib/lp/services/webhooks/tests/test_webservice.py
index cdf92b5..19af1bc 100644
--- a/lib/lp/services/webhooks/tests/test_webservice.py
+++ b/lib/lp/services/webhooks/tests/test_webservice.py
@@ -23,6 +23,10 @@ from zope.security.proxy import removeSecurityProxy
 
 from lp.services.features.testing import FeatureFixture
 from lp.services.webapp.interfaces import OAuthPermission
+from lp.soyuz.interfaces.livefs import (
+    LIVEFS_FEATURE_FLAG,
+    LIVEFS_WEBHOOKS_FEATURE_FLAG,
+    )
 from lp.testing import (
     api_url,
     person_logged_in,
@@ -379,3 +383,14 @@ class TestWebhookTargetSnap(TestWebhookTargetBase, TestCaseWithFactory):
     def makeTarget(self):
         owner = self.factory.makePerson()
         return self.factory.makeSnap(registrant=owner, owner=owner)
+
+
+class TestWebhookTargetLiveFS(TestWebhookTargetBase, TestCaseWithFactory):
+
+    event_type = 'livefs:build:0.1'
+
+    def makeTarget(self):
+        owner = self.factory.makePerson()
+        with FeatureFixture({LIVEFS_FEATURE_FLAG: "on",
+                             LIVEFS_WEBHOOKS_FEATURE_FLAG: "on"}):
+            return self.factory.makeLiveFS(registrant=owner, owner=owner)
diff --git a/lib/lp/soyuz/browser/livefs.py b/lib/lp/soyuz/browser/livefs.py
index 5f1bfb9..e2659ca 100644
--- a/lib/lp/soyuz/browser/livefs.py
+++ b/lib/lp/soyuz/browser/livefs.py
@@ -55,6 +55,7 @@ from lp.services.webapp.breadcrumb import (
     Breadcrumb,
     NameBreadcrumb,
     )
+from lp.services.webhooks.browser import WebhookTargetNavigationMixin
 from lp.soyuz.browser.build import get_build_by_id_str
 from lp.soyuz.interfaces.livefs import (
     ILiveFS,
@@ -66,7 +67,7 @@ from lp.soyuz.interfaces.livefs import (
 from lp.soyuz.interfaces.livefsbuild import ILiveFSBuildSet
 
 
-class LiveFSNavigation(Navigation):
+class LiveFSNavigation(WebhookTargetNavigationMixin, Navigation):
     usedfor = ILiveFS
 
     @stepthrough('+build')
diff --git a/lib/lp/soyuz/configure.zcml b/lib/lp/soyuz/configure.zcml
index 0e35ccb..da011cc 100644
--- a/lib/lp/soyuz/configure.zcml
+++ b/lib/lp/soyuz/configure.zcml
@@ -1022,6 +1022,14 @@
             permission="launchpad.Admin"
             interface=".interfaces.livefsbuild.ILiveFSBuildAdmin"/>
     </class>
+    <subscriber
+        for="lp.soyuz.interfaces.livefsbuild.ILiveFSBuild
+             lazr.lifecycle.interfaces.IObjectCreatedEvent"
+        handler="lp.soyuz.subscribers.livefsbuild.livefs_build_created" />
+    <subscriber
+        for="lp.soyuz.interfaces.livefsbuild.ILiveFSBuild
+             lazr.lifecycle.interfaces.IObjectModifiedEvent"
+        handler="lp.soyuz.subscribers.livefsbuild.livefs_build_status_changed" />
 
     <!-- LiveFSBuildSet -->
     <securedutility
diff --git a/lib/lp/soyuz/interfaces/livefs.py b/lib/lp/soyuz/interfaces/livefs.py
index 140f874..c530dc8 100644
--- a/lib/lp/soyuz/interfaces/livefs.py
+++ b/lib/lp/soyuz/interfaces/livefs.py
@@ -14,6 +14,7 @@ __all__ = [
     'ILiveFSSet',
     'ILiveFSView',
     'LIVEFS_FEATURE_FLAG',
+    'LIVEFS_WEBHOOKS_FEATURE_FLAG',
     'LiveFSBuildAlreadyPending',
     'LiveFSBuildArchiveOwnerMismatch',
     'LiveFSFeatureDisabled',
@@ -69,11 +70,13 @@ from lp.services.fields import (
     PersonChoice,
     PublicPersonChoice,
     )
+from lp.services.webhooks.interfaces import IWebhookTarget
 from lp.soyuz.interfaces.archive import IArchive
 from lp.soyuz.interfaces.distroarchseries import IDistroArchSeries
 
 
 LIVEFS_FEATURE_FLAG = u"soyuz.livefs.allow_new"
+LIVEFS_WEBHOOKS_FEATURE_FLAG = u"soyuz.livefs.webhooks.enabled"
 
 
 @error_status(httplib.BAD_REQUEST)
@@ -213,7 +216,7 @@ class ILiveFSView(IPrivacy):
         value_type=Reference(schema=Interface), readonly=True)))
 
 
-class ILiveFSEdit(Interface):
+class ILiveFSEdit(IWebhookTarget):
     """`ILiveFS` methods that require launchpad.Edit permission."""
 
     @export_destructor_operation()
diff --git a/lib/lp/soyuz/model/livefs.py b/lib/lp/soyuz/model/livefs.py
index b79c1ca..0ec68b4 100644
--- a/lib/lp/soyuz/model/livefs.py
+++ b/lib/lp/soyuz/model/livefs.py
@@ -9,6 +9,7 @@ __all__ = [
 from datetime import timedelta
 import math
 
+from lazr.lifecycle.event import ObjectCreatedEvent
 import pytz
 from storm.locals import (
     Bool,
@@ -24,6 +25,7 @@ from storm.locals import (
     Unicode,
     )
 from zope.component import getUtility
+from zope.event import notify
 from zope.interface import implementer
 from zope.security.proxy import removeSecurityProxy
 
@@ -57,6 +59,8 @@ from lp.services.database.stormexpr import (
     )
 from lp.services.features import getFeatureFlag
 from lp.services.webapp.interfaces import ILaunchBag
+from lp.services.webhooks.interfaces import IWebhookSet
+from lp.services.webhooks.model import WebhookTargetMixin
 from lp.soyuz.interfaces.archive import ArchiveDisabled
 from lp.soyuz.interfaces.livefs import (
     CannotDeleteLiveFS,
@@ -88,7 +92,7 @@ def livefs_modified(livefs, event):
 
 
 @implementer(ILiveFS, IHasOwner)
-class LiveFS(Storm):
+class LiveFS(Storm, WebhookTargetMixin):
     """See `ILiveFS`."""
 
     __storm_table__ = 'LiveFS'
@@ -139,6 +143,10 @@ class LiveFS(Storm):
         self.keep_binary_files_days = keep_binary_files_days
 
     @property
+    def valid_webhook_event_types(self):
+        return ["livefs:build:0.1"]
+
+    @property
     def private(self):
         """See `IPrivacy`."""
         # A LiveFS has no privacy support of its own, but it is private if
@@ -191,6 +199,7 @@ class LiveFS(Storm):
             unique_key=unique_key, metadata_override=metadata_override,
             version=version)
         build.queueBuild()
+        notify(ObjectCreatedEvent(build, user=requester))
         return build
 
     def _getBuilds(self, filter_term, order_by):
@@ -255,6 +264,7 @@ class LiveFS(Storm):
         if not self.builds.is_empty():
             raise CannotDeleteLiveFS(
                 "Cannot delete a live filesystem with builds.")
+        getUtility(IWebhookSet).delete(self.webhooks)
         IStore(LiveFS).remove(self)
 
 
diff --git a/lib/lp/soyuz/model/livefsbuild.py b/lib/lp/soyuz/model/livefsbuild.py
index 310ab5c..2bf500e 100644
--- a/lib/lp/soyuz/model/livefsbuild.py
+++ b/lib/lp/soyuz/model/livefsbuild.py
@@ -50,6 +50,7 @@ from lp.services.librarian.model import (
     LibraryFileAlias,
     LibraryFileContent,
     )
+from lp.services.webapp.snapshot import notify_modified
 from lp.soyuz.interfaces.component import IComponentSet
 from lp.soyuz.interfaces.livefs import (
     LIVEFS_FEATURE_FLAG,
@@ -315,6 +316,20 @@ class LiveFSBuild(PackageBuildMixin, Storm):
         """See `IPackageBuild`."""
         return not self.getFiles().is_empty()
 
+    def updateStatus(self, status, builder=None, slave_status=None,
+                     date_started=None, date_finished=None,
+                     force_invalid_transition=False):
+        """See `IBuildFarmJob`."""
+
+        edited_fields = set()
+        with notify_modified(self, edited_fields) as previous_obj:
+            super(LiveFSBuild, self).updateStatus(
+                status, builder=builder, slave_status=slave_status,
+                date_started=date_started, date_finished=date_finished,
+                force_invalid_transition=force_invalid_transition)
+            if self.status != previous_obj.status:
+                edited_fields.add("status")
+
     def notify(self, extra_info=None):
         """See `IPackageBuild`."""
         if not config.builddmaster.send_build_notification:
diff --git a/lib/lp/soyuz/subscribers/__init__.py b/lib/lp/soyuz/subscribers/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/lib/lp/soyuz/subscribers/__init__.py
diff --git a/lib/lp/soyuz/subscribers/livefsbuild.py b/lib/lp/soyuz/subscribers/livefsbuild.py
new file mode 100644
index 0000000..852f9d3
--- /dev/null
+++ b/lib/lp/soyuz/subscribers/livefsbuild.py
@@ -0,0 +1,43 @@
+# Copyright 2016-2020 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Event subscribers for livefs builds."""
+from __future__ import absolute_import, print_function, unicode_literals
+
+
+__metaclass__ = type
+
+
+from zope.component import getUtility
+
+from lp.services.features import getFeatureFlag
+from lp.services.webapp.publisher import canonical_url
+from lp.services.webhooks.interfaces import IWebhookSet
+from lp.services.webhooks.payload import compose_webhook_payload
+from lp.soyuz.interfaces.livefs import LIVEFS_WEBHOOKS_FEATURE_FLAG
+from lp.soyuz.interfaces.livefsbuild import ILiveFSBuild
+
+
+def _trigger_livefs_build_webhook(livefsbuild, action):
+    if getFeatureFlag(LIVEFS_WEBHOOKS_FEATURE_FLAG):
+        payload = {
+            "livefs_build": canonical_url(livefsbuild, force_local_path=True),
+            "action": action,
+            }
+        payload.update(compose_webhook_payload(
+            ILiveFSBuild, livefsbuild,
+            ["livefs", "status"]))
+        getUtility(IWebhookSet).trigger(
+            livefsbuild.livefs, "livefs:build:0.1", payload)
+
+
+def livefs_build_created(livefsbuild, event):
+    """Trigger events when a new livefs build is created."""
+    _trigger_livefs_build_webhook(livefsbuild, "created")
+
+
+def livefs_build_status_changed(livefsbuild, event):
+    """Trigger events when livefs package build statuses change."""
+    if event.edited_fields is not None:
+        if "status" in event.edited_fields:
+            _trigger_livefs_build_webhook(livefsbuild, "status-changed")
diff --git a/lib/lp/soyuz/tests/test_livefs.py b/lib/lp/soyuz/tests/test_livefs.py
index 29170b4..315b96a 100644
--- a/lib/lp/soyuz/tests/test_livefs.py
+++ b/lib/lp/soyuz/tests/test_livefs.py
@@ -12,9 +12,15 @@ from datetime import (
     timedelta,
     )
 
+from fixtures import FakeLogger
 import pytz
+from storm.exceptions import LostObjectError
 from storm.locals import Store
-from testtools.matchers import Equals
+from testtools.matchers import (
+    Equals,
+    MatchesDict,
+    MatchesStructure,
+    )
 import transaction
 from zope.component import getUtility
 from zope.security.interfaces import Unauthorized
@@ -30,16 +36,20 @@ from lp.buildmaster.model.buildqueue import BuildQueue
 from lp.registry.enums import PersonVisibility
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.pocket import PackagePublishingPocket
+from lp.services.config import config
 from lp.services.database.constants import UTC_NOW
 from lp.services.features.testing import FeatureFixture
+from lp.services.webapp import canonical_url
 from lp.services.webapp.interfaces import OAuthPermission
 from lp.services.webapp.snapshot import notify_modified
+from lp.services.webhooks.testing import LogsScheduledWebhooks
 from lp.soyuz.interfaces.livefs import (
     CannotDeleteLiveFS,
     ILiveFS,
     ILiveFSSet,
     ILiveFSView,
     LIVEFS_FEATURE_FLAG,
+    LIVEFS_WEBHOOKS_FEATURE_FLAG,
     LiveFSBuildAlreadyPending,
     LiveFSFeatureDisabled,
     )
@@ -54,6 +64,7 @@ from lp.testing import (
     StormStatementRecorder,
     TestCaseWithFactory,
     )
+from lp.testing.dbuser import dbuser
 from lp.testing.layers import (
     DatabaseFunctionalLayer,
     LaunchpadZopelessLayer,
@@ -362,6 +373,57 @@ class TestLiveFS(TestCaseWithFactory):
         self.assertTrue(
             getUtility(ILiveFSSet).exists(owner, distroseries, "condemned"))
 
+    def test_requestBuild_triggers_webhooks(self):
+        # Requesting a build triggers webhooks.
+        logger = self.useFixture(FakeLogger())
+        with FeatureFixture({LIVEFS_FEATURE_FLAG: "on",
+                             LIVEFS_WEBHOOKS_FEATURE_FLAG: "on"}):
+            livefs = self.factory.makeLiveFS()
+            distroarchseries = self.factory.makeDistroArchSeries(
+                distroseries=livefs.distro_series)
+            hook = self.factory.makeWebhook(
+                target=livefs, event_types=["livefs:build:0.1"])
+            build = livefs.requestBuild(
+                livefs.owner, livefs.distro_series.main_archive,
+                distroarchseries,
+                PackagePublishingPocket.RELEASE)
+
+        expected_payload = {
+            "livefs_build": Equals(canonical_url(build,
+                                                 force_local_path=True)),
+            "action": Equals("created"),
+            "livefs": Equals(canonical_url(livefs, force_local_path=True)),
+            "status": Equals("Needs building"),
+            }
+        with person_logged_in(livefs.owner):
+            delivery = hook.deliveries.one()
+            self.assertThat(
+                delivery, MatchesStructure(
+                    event_type=Equals("livefs:build:0.1"),
+                    payload=MatchesDict(expected_payload)))
+            with dbuser(config.IWebhookDeliveryJobSource.dbuser):
+                self.assertEqual(
+                    "<WebhookDeliveryJob for webhook %d on %r>" % (
+                        hook.id, hook.target),
+                    repr(delivery))
+                self.assertThat(
+                    logger.output,
+                    LogsScheduledWebhooks([
+                        (hook, "livefs:build:0.1",
+                         MatchesDict(expected_payload))]))
+
+    def test_related_webhooks_deleted(self):
+        owner = self.factory.makePerson()
+        with FeatureFixture({LIVEFS_FEATURE_FLAG: "on",
+                             LIVEFS_WEBHOOKS_FEATURE_FLAG: "on"}):
+            livefs = self.factory.makeLiveFS(registrant=owner, owner=owner)
+            webhook = self.factory.makeWebhook(target=livefs)
+        with person_logged_in(livefs.owner):
+            webhook.ping()
+            livefs.destroySelf()
+            transaction.commit()
+            self.assertRaises(LostObjectError, getattr, webhook, "target")
+
 
 class TestLiveFSSet(TestCaseWithFactory):
 
diff --git a/lib/lp/soyuz/tests/test_livefsbuild.py b/lib/lp/soyuz/tests/test_livefsbuild.py
index 987c6b1..99ceccc 100644
--- a/lib/lp/soyuz/tests/test_livefsbuild.py
+++ b/lib/lp/soyuz/tests/test_livefsbuild.py
@@ -13,7 +13,14 @@ from datetime import (
     )
 from urllib2 import urlopen
 
+from fixtures import FakeLogger
 import pytz
+from testtools.matchers import (
+    ContainsDict,
+    Equals,
+    MatchesDict,
+    MatchesStructure,
+    )
 from zope.component import getUtility
 from zope.security.proxy import removeSecurityProxy
 
@@ -31,9 +38,12 @@ from lp.services.config import config
 from lp.services.features.testing import FeatureFixture
 from lp.services.librarian.browser import ProxiedLibraryFileAlias
 from lp.services.webapp.interfaces import OAuthPermission
+from lp.services.webapp.publisher import canonical_url
+from lp.services.webhooks.testing import LogsScheduledWebhooks
 from lp.soyuz.enums import ArchivePurpose
 from lp.soyuz.interfaces.livefs import (
     LIVEFS_FEATURE_FLAG,
+    LIVEFS_WEBHOOKS_FEATURE_FLAG,
     LiveFSFeatureDisabled,
     )
 from lp.soyuz.interfaces.livefsbuild import (
@@ -48,6 +58,7 @@ from lp.testing import (
     person_logged_in,
     TestCaseWithFactory,
     )
+from lp.testing.dbuser import dbuser
 from lp.testing.layers import (
     LaunchpadFunctionalLayer,
     LaunchpadZopelessLayer,
@@ -162,6 +173,62 @@ class TestLiveFSBuild(TestCaseWithFactory):
         self.assertEqual(BuildStatus.CANCELLED, self.build.status)
         self.assertIsNone(self.build.buildqueue_record)
 
+    def test_updateStatus_triggers_webhooks(self):
+        # Updating the status of a SnapBuild triggers webhooks on the
+        # corresponding Snap.
+        logger = self.useFixture(FakeLogger())
+        hook = self.factory.makeWebhook(
+            target=self.build.livefs, event_types=["livefs:build:0.1"])
+        with FeatureFixture({LIVEFS_WEBHOOKS_FEATURE_FLAG: "on"}):
+            self.build.updateStatus(BuildStatus.FULLYBUILT)
+        expected_payload = {
+            "livefs_build": Equals(
+                canonical_url(self.build, force_local_path=True)),
+            "action": Equals("status-changed"),
+            "livefs": Equals(
+                 canonical_url(self.build.livefs, force_local_path=True)),
+            "status": Equals("Successfully built"),
+            }
+        self.assertThat(
+            logger.output, LogsScheduledWebhooks([
+                (hook, "livefs:build:0.1", MatchesDict(expected_payload))]))
+
+        delivery = hook.deliveries.one()
+        self.assertThat(
+            delivery, MatchesStructure(
+                event_type=Equals("livefs:build:0.1"),
+                payload=MatchesDict(expected_payload)))
+        with dbuser(config.IWebhookDeliveryJobSource.dbuser):
+            self.assertEqual(
+                "<WebhookDeliveryJob for webhook %d on %r>" % (
+                    hook.id, hook.target),
+                repr(delivery))
+
+    def test_updateStatus_no_change_does_not_trigger_webhooks(self):
+        # An updateStatus call that doesn't change the build's status
+        # attribute does not trigger webhooks.
+        logger = self.useFixture(FakeLogger())
+        hook = self.factory.makeWebhook(
+            target=self.build.livefs, event_types=["livefs:build:0.1"])
+        with FeatureFixture({LIVEFS_WEBHOOKS_FEATURE_FLAG: "on"}):
+            self.build.updateStatus(BuildStatus.BUILDING)
+        expected_logs = [
+            (hook, "livefs:build:0.1", ContainsDict({
+                "action": Equals("status-changed"),
+                "status": Equals("Currently building"),
+                }))]
+        self.assertEqual(1, hook.deliveries.count())
+        self.assertThat(logger.output, LogsScheduledWebhooks(expected_logs))
+
+        self.build.updateStatus(BuildStatus.BUILDING)
+        expected_logs = [
+            (hook, "livefs:build:0.1", ContainsDict({
+                "action": Equals("status-changed"),
+                "status": Equals("Currently building"),
+                }))]
+        self.assertEqual(1, hook.deliveries.count())
+        self.assertThat(logger.output, LogsScheduledWebhooks(expected_logs))
+
     def test_cancel_in_progress(self):
         # The cancel() method for a building build leaves it in the
         # CANCELLING state.