Merge lp:~twom/launchpad/snap-release-intents into lp:launchpad

[Tom Wardill]

Use release intents to release snapbuilds to channels after building

Use the SCA support for 'release_intents' and pass the required parameters to produce a release to a channel after review stage.
Pass `channels` and `only_if_newer` to ensure that the build is only released if it is newer that the current existing build in the specified channels.

[Colin Watson (cjwatson)]

I think in general this looks OK, but I want to see a bit more effort to go through and root out vestiges of the old workflow.

review: Needs Fixing

[Colin Watson (cjwatson)]

review: Approve

=== removed file 'lib/lp/snappy/emailtemplates/snapbuild-manualreview.txt'
--- lib/lp/snappy/emailtemplates/snapbuild-manualreview.txt	2016-06-30 16:44:14 +0000
+++ lib/lp/snappy/emailtemplates/snapbuild-manualreview.txt	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-This snap package could not be released automatically because it was held
-for manual review.  Once it has been approved, you will need to release it
-manually from here:
-
-  %(store_url)s

=== removed file 'lib/lp/snappy/emailtemplates/snapbuild-releasefailed.txt'
--- lib/lp/snappy/emailtemplates/snapbuild-releasefailed.txt	2016-06-30 16:44:14 +0000
+++ lib/lp/snappy/emailtemplates/snapbuild-releasefailed.txt	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-Launchpad asked the store to release this snap package, but it failed:
-
-  %(store_error_message)s
-
-You can try to release it manually here:
-
-  %(store_url)s

=== modified file 'lib/lp/snappy/interfaces/snapbuild.py'
--- lib/lp/snappy/interfaces/snapbuild.py	2019-05-22 18:33:10 +0000
+++ lib/lp/snappy/interfaces/snapbuild.py	2019-06-19 16:07:26 +0000
@@ -111,6 +111,9 @@
         The last attempt to upload this snap build to the store failed.
         """)
 
+    # This is an impossible state for new releases (2019-06-19), due
+    # to the store handling releases for us, however historical tasks
+    # can have this status, so it is maintained here.
     FAILEDTORELEASE = Item("""
         Failed to release to channels
 

=== modified file 'lib/lp/snappy/interfaces/snapstoreclient.py'
--- lib/lp/snappy/interfaces/snapstoreclient.py	2018-05-02 23:55:51 +0000
+++ lib/lp/snappy/interfaces/snapstoreclient.py	2019-06-19 16:07:26 +0000
@@ -13,7 +13,6 @@
     'BadSearchResponse',
     'ISnapStoreClient',
     'NeedsRefreshResponse',
-    'ReleaseFailedResponse',
     'ScanFailedResponse',
     'SnapStoreError',
     'UnauthorizedUploadResponse',
@@ -75,10 +74,6 @@
     pass
 
 
-class ReleaseFailedResponse(SnapStoreError):
-    pass
-
-
 class ISnapStoreClient(Interface):
     """Interface for the API provided by the snap store."""
 
@@ -150,13 +145,3 @@
         :return: A list of dictionaries, one per channel, each of which
             contains at least "name" and "display_name" keys.
         """
-
-    def release(snapbuild, revision):
-        """Tell the store to release a snap build to specified channels.
-
-        :param snapbuild: The `ISnapBuild` to release.
-        :param revision: The revision returned by the store when uploading
-            the build.
-        :raises ReleaseFailedResponse: if the store failed to release the
-            build.
-        """

=== modified file 'lib/lp/snappy/mail/snapbuild.py'
--- lib/lp/snappy/mail/snapbuild.py	2017-06-12 16:37:40 +0000
+++ lib/lp/snappy/mail/snapbuild.py	2019-06-19 16:07:26 +0000
@@ -88,34 +88,6 @@
             config.canonical.noreply_from_address,
             "snap-build-upload-scan-failed", build)
 
-    @classmethod
-    def forManualReview(cls, build):
-        """Create a mailer for notifying about manual review.
-
-        :param build: The relevant build.
-        """
-        requester = build.requester
-        recipients = {requester: RecipientReason.forBuildRequester(requester)}
-        return cls(
-            "%(snap_name)s held for manual review",
-            "snapbuild-manualreview.txt", recipients,
-            config.canonical.noreply_from_address,
-            "snap-build-release-manual-review", build)
-
-    @classmethod
-    def forReleaseFailure(cls, build):
-        """Create a mailer for notifying about store release failures.
-
-        :param build: The relevant build.
-        """
-        requester = build.requester
-        recipients = {requester: RecipientReason.forBuildRequester(requester)}
-        return cls(
-            "Store release failed for %(snap_name)s",
-            "snapbuild-releasefailed.txt", recipients,
-            config.canonical.noreply_from_address,
-            "snap-build-release-failed", build)
-
     def __init__(self, subject, template_name, recipients, from_address,
                  notification_type, build):
         super(SnapBuildMailer, self).__init__(

=== modified file 'lib/lp/snappy/model/snapbuildjob.py'
--- lib/lp/snappy/model/snapbuildjob.py	2018-12-18 18:10:39 +0000
+++ lib/lp/snappy/model/snapbuildjob.py	2019-06-19 16:07:26 +0000
@@ -58,7 +58,6 @@
     BadRefreshResponse,
     BadScanStatusResponse,
     ISnapStoreClient,
-    ReleaseFailedResponse,
     ScanFailedResponse,
     SnapStoreError,
     UnauthorizedUploadResponse,
@@ -169,10 +168,6 @@
         return oops_vars
 
 
-class ManualReview(SnapStoreError):
-    pass
-
-
 class RetryableSnapStoreError(SnapStoreError):
     pass
 
@@ -192,8 +187,6 @@
     user_error_types = (
         UnauthorizedUploadResponse,
         ScanFailedResponse,
-        ManualReview,
-        ReleaseFailedResponse,
         )
 
     retry_error_types = (UploadNotScannedYetResponse, RetryableSnapStoreError)
@@ -341,16 +334,12 @@
                 # We made progress, so reset attempt_count.
                 self.attempt_count = 1
             if self.store_url is None:
+                # This is no longer strictly necessary as the store is handling
+                # releases via the release intent, but we export various fields
+                # via the api, so once this is called, we're done with
+                # this task
                 self.store_url, self.store_revision = (
                     client.checkStatus(self.status_url))
-                # We made progress, so reset attempt_count.
-                self.attempt_count = 1
-            if self.snapbuild.snap.store_channels:
-                if self.store_revision is None:
-                    raise ManualReview(
-                        "Package held for manual review on the store; "
-                        "cannot release it automatically.")
-                client.release(self.snapbuild, self.store_revision)
             self.error_message = None
         except self.retry_error_types:
             raise
@@ -373,12 +362,6 @@
             elif isinstance(e, (BadScanStatusResponse, ScanFailedResponse)):
                 mailer = SnapBuildMailer.forUploadScanFailure(self.snapbuild)
                 mailer.sendAll()
-            elif isinstance(e, ManualReview):
-                mailer = SnapBuildMailer.forManualReview(self.snapbuild)
-                mailer.sendAll()
-            elif isinstance(e, ReleaseFailedResponse):
-                mailer = SnapBuildMailer.forReleaseFailure(self.snapbuild)
-                mailer.sendAll()
             # The normal job infrastructure will abort the transaction, but
             # we want to commit instead: the only database changes we make
             # are to this job's metadata and should be preserved.

=== modified file 'lib/lp/snappy/model/snapstoreclient.py'
--- lib/lp/snappy/model/snapstoreclient.py	2019-06-14 14:46:15 +0000
+++ lib/lp/snappy/model/snapstoreclient.py	2019-06-19 16:07:26 +0000
@@ -43,7 +43,6 @@
     BadSearchResponse,
     ISnapStoreClient,
     NeedsRefreshResponse,
-    ReleaseFailedResponse,
     ScanFailedResponse,
     UnauthorizedUploadResponse,
     UploadFailedResponse,
@@ -266,6 +265,14 @@
             "series": snap.store_series.name,
             "built_at": snapbuild.date_started.isoformat(),
             }
+        # The security proxy is useless and breaks JSON serialisation.
+        channels = removeSecurityProxy(snap.store_channels)
+        if channels:
+            # This will cause a release
+            data.update({
+                "channels": channels,
+                "only_if_newer": True,
+                })
         # XXX cjwatson 2016-05-09: This should add timeline information, but
         # that's currently difficult in jobs.
         try:
@@ -346,8 +353,6 @@
                     error_messages.append(error_detail)
                 raise ScanFailedResponse(
                     error_message, messages=error_messages)
-            elif not response_data["can_release"]:
-                return response_data["url"], None
             else:
                 return response_data["url"], response_data["revision"]
         except requests.HTTPError as e:
@@ -394,41 +399,3 @@
         if channels is None:
             channels = _default_store_channels
         return channels
-
-    @classmethod
-    def _release(cls, snap, revision):
-        """Release a snap revision to specified channels."""
-        release_url = urlappend(
-            config.snappy.store_url, "dev/api/snap-release/")
-        data = {
-            "name": snap.store_name,
-            "revision": revision,
-            # The security proxy is useless and breaks JSON serialisation.
-            "channels": removeSecurityProxy(snap.store_channels),
-            "series": snap.store_series.name,
-            }
-        # XXX cjwatson 2016-06-28: This should add timeline information, but
-        # that's currently difficult in jobs.
-        try:
-            assert snap.store_secrets is not None
-            urlfetch(
-                release_url, method="POST", json=data,
-                auth=MacaroonAuth(
-                    snap.store_secrets["root"],
-                    snap.store_secrets.get("discharge")))
-        except requests.HTTPError as e:
-            if e.response.status_code == 401:
-                if (e.response.headers.get("WWW-Authenticate") ==
-                        "Macaroon needs_refresh=1"):
-                    raise NeedsRefreshResponse()
-            raise cls._makeSnapStoreError(ReleaseFailedResponse, e)
-
-    @classmethod
-    def release(cls, snapbuild, revision):
-        """See `ISnapStoreClient`."""
-        assert config.snappy.store_url is not None
-        snap = snapbuild.snap
-        assert snap.store_name is not None
-        assert snap.store_series is not None
-        assert snap.store_channels
-        cls.refreshIfNecessary(snap, cls._release, snap, revision)

=== modified file 'lib/lp/snappy/tests/test_snapbuildjob.py'
--- lib/lp/snappy/tests/test_snapbuildjob.py	2019-05-22 14:57:45 +0000
+++ lib/lp/snappy/tests/test_snapbuildjob.py	2019-06-19 16:07:26 +0000
@@ -35,7 +35,6 @@
 from lp.snappy.interfaces.snapstoreclient import (
     BadRefreshResponse,
     ISnapStoreClient,
-    ReleaseFailedResponse,
     ScanFailedResponse,
     UnauthorizedUploadResponse,
     UploadFailedResponse,
@@ -65,7 +64,6 @@
         self.upload = FakeMethod()
         self.checkStatus = FakeMethod()
         self.listChannels = FakeMethod(result=[])
-        self.release = FakeMethod()
 
 
 class TestSnapBuildJob(TestCaseWithFactory):
@@ -160,7 +158,6 @@
             JobRunner([job]).runAll()
         self.assertEqual([((snapbuild,), {})], client.upload.calls)
         self.assertEqual([((self.status_url,), {})], client.checkStatus.calls)
-        self.assertEqual([], client.release.calls)
         self.assertContentEqual([job], snapbuild.store_upload_jobs)
         self.assertEqual(self.store_url, job.store_url)
         self.assertEqual(1, job.store_revision)
@@ -180,7 +177,6 @@
             JobRunner([job]).runAll()
         self.assertEqual([((snapbuild,), {})], client.upload.calls)
         self.assertEqual([], client.checkStatus.calls)
-        self.assertEqual([], client.release.calls)
         self.assertContentEqual([job], snapbuild.store_upload_jobs)
         self.assertIsNone(job.store_url)
         self.assertIsNone(job.store_revision)
@@ -206,7 +202,6 @@
             JobRunner([job]).runAll()
         self.assertEqual([((snapbuild,), {})], client.upload.calls)
         self.assertEqual([], client.checkStatus.calls)
-        self.assertEqual([], client.release.calls)
         self.assertContentEqual([job], snapbuild.store_upload_jobs)
         self.assertIsNone(job.store_url)
         self.assertIsNone(job.store_revision)
@@ -253,7 +248,6 @@
             JobRunner([job]).runAll()
         self.assertEqual([((snapbuild,), {})], client.upload.calls)
         self.assertEqual([], client.checkStatus.calls)
-        self.assertEqual([], client.release.calls)
         self.assertContentEqual([job], snapbuild.store_upload_jobs)
         self.assertIsNone(job.store_url)
         self.assertIsNone(job.store_revision)
@@ -272,7 +266,6 @@
             JobRunner([job]).runAll()
         self.assertEqual([((snapbuild,), {})], client.upload.calls)
         self.assertEqual([((self.status_url,), {})], client.checkStatus.calls)
-        self.assertEqual([], client.release.calls)
         self.assertContentEqual([job], snapbuild.store_upload_jobs)
         self.assertEqual(self.store_url, job.store_url)
         self.assertEqual(1, job.store_revision)
@@ -298,7 +291,6 @@
             JobRunner([job]).runAll()
         self.assertEqual([((snapbuild,), {})], client.upload.calls)
         self.assertEqual([], client.checkStatus.calls)
-        self.assertEqual([], client.release.calls)
         self.assertContentEqual([job], snapbuild.store_upload_jobs)
         self.assertIsNone(job.store_url)
         self.assertIsNone(job.store_revision)
@@ -349,7 +341,6 @@
             JobRunner([job]).runAll()
         self.assertEqual([((snapbuild,), {})], client.upload.calls)
         self.assertEqual([], client.checkStatus.calls)
-        self.assertEqual([], client.release.calls)
         self.assertContentEqual([job], snapbuild.store_upload_jobs)
         self.assertIsNone(job.store_url)
         self.assertIsNone(job.store_revision)
@@ -399,7 +390,6 @@
             JobRunner([job]).runAll()
         self.assertEqual([((snapbuild,), {})], client.upload.calls)
         self.assertEqual([((self.status_url,), {})], client.checkStatus.calls)
-        self.assertEqual([], client.release.calls)
         self.assertContentEqual([job], snapbuild.store_upload_jobs)
         self.assertIsNone(job.store_url)
         self.assertIsNone(job.store_revision)
@@ -418,7 +408,6 @@
             JobRunner([job]).runAll()
         self.assertEqual([], client.upload.calls)
         self.assertEqual([((self.status_url,), {})], client.checkStatus.calls)
-        self.assertEqual([], client.release.calls)
         self.assertContentEqual([job], snapbuild.store_upload_jobs)
         self.assertEqual(self.store_url, job.store_url)
         self.assertEqual(1, job.store_revision)
@@ -448,7 +437,6 @@
             JobRunner([job]).runAll()
         self.assertEqual([((snapbuild,), {})], client.upload.calls)
         self.assertEqual([((self.status_url,), {})], client.checkStatus.calls)
-        self.assertEqual([], client.release.calls)
         self.assertContentEqual([job], snapbuild.store_upload_jobs)
         self.assertIsNone(job.store_url)
         self.assertIsNone(job.store_revision)
@@ -497,7 +485,6 @@
             JobRunner([job]).runAll()
         self.assertEqual([((snapbuild,), {})], client.upload.calls)
         self.assertEqual([((self.status_url,), {})], client.checkStatus.calls)
-        self.assertEqual([((snapbuild, 1), {})], client.release.calls)
         self.assertContentEqual([job], snapbuild.store_upload_jobs)
         self.assertEqual(self.store_url, job.store_url)
         self.assertEqual(1, job.store_revision)
@@ -505,110 +492,6 @@
         self.assertEqual([], pop_notifications())
         self.assertWebhookDeliveries(snapbuild, ["Pending", "Uploaded"])
 
-    def test_run_release_manual_review_notifies(self):
-        # A run configured to automatically release the package to certain
-        # channels but that encounters the manual review state on upload
-        # sends mail.
-        requester = self.factory.makePerson(name="requester")
-        requester_team = self.factory.makeTeam(
-            owner=requester, name="requester-team", members=[requester])
-        snapbuild = self.makeSnapBuild(
-            requester=requester_team, name="test-snap", owner=requester_team,
-            store_channels=["stable", "edge"])
-        self.assertContentEqual([], snapbuild.store_upload_jobs)
-        job = SnapStoreUploadJob.create(snapbuild)
-        client = FakeSnapStoreClient()
-        client.upload.result = self.status_url
-        client.checkStatus.result = (self.store_url, None)
-        self.useFixture(ZopeUtilityFixture(client, ISnapStoreClient))
-        with dbuser(config.ISnapStoreUploadJobSource.dbuser):
-            JobRunner([job]).runAll()
-        self.assertEqual([((snapbuild,), {})], client.upload.calls)
-        self.assertEqual([((self.status_url,), {})], client.checkStatus.calls)
-        self.assertEqual([], client.release.calls)
-        self.assertContentEqual([job], snapbuild.store_upload_jobs)
-        self.assertEqual(self.store_url, job.store_url)
-        self.assertIsNone(job.store_revision)
-        self.assertEqual(
-            "Package held for manual review on the store; "
-            "cannot release it automatically.",
-            job.error_message)
-        [notification] = pop_notifications()
-        self.assertEqual(
-            config.canonical.noreply_from_address, notification["From"])
-        self.assertEqual(
-            "Requester <%s>" % requester.preferredemail.email,
-            notification["To"])
-        subject = notification["Subject"].replace("\n ", " ")
-        self.assertEqual("test-snap held for manual review", subject)
-        self.assertEqual(
-            "Requester @requester-team",
-            notification["X-Launchpad-Message-Rationale"])
-        self.assertEqual(
-            requester_team.name, notification["X-Launchpad-Message-For"])
-        self.assertEqual(
-            "snap-build-release-manual-review",
-            notification["X-Launchpad-Notification-Type"])
-        body, footer = notification.get_payload(decode=True).split("\n-- \n")
-        self.assertIn(self.store_url, body)
-        self.assertEqual(
-            "http://launchpad.test/~requester-team/+snap/test-snap/+build/%d\n"
-            "Your team Requester Team is the requester of the build.\n" %
-            snapbuild.id, footer)
-        self.assertWebhookDeliveries(
-            snapbuild, ["Pending", "Failed to release to channels"])
-
-    def test_run_release_failure_notifies(self):
-        # A run configured to automatically release the package to certain
-        # channels but that fails to do so sends mail.
-        requester = self.factory.makePerson(name="requester")
-        requester_team = self.factory.makeTeam(
-            owner=requester, name="requester-team", members=[requester])
-        snapbuild = self.makeSnapBuild(
-            requester=requester_team, name="test-snap", owner=requester_team,
-            store_channels=["stable", "edge"])
-        self.assertContentEqual([], snapbuild.store_upload_jobs)
-        job = SnapStoreUploadJob.create(snapbuild)
-        client = FakeSnapStoreClient()
-        client.upload.result = self.status_url
-        client.checkStatus.result = (self.store_url, 1)
-        client.release.failure = ReleaseFailedResponse("Failed to publish")
-        self.useFixture(ZopeUtilityFixture(client, ISnapStoreClient))
-        with dbuser(config.ISnapStoreUploadJobSource.dbuser):
-            JobRunner([job]).runAll()
-        self.assertEqual([((snapbuild,), {})], client.upload.calls)
-        self.assertEqual([((self.status_url,), {})], client.checkStatus.calls)
-        self.assertEqual([((snapbuild, 1), {})], client.release.calls)
-        self.assertContentEqual([job], snapbuild.store_upload_jobs)
-        self.assertEqual(self.store_url, job.store_url)
-        self.assertEqual(1, job.store_revision)
-        self.assertEqual("Failed to publish", job.error_message)
-        [notification] = pop_notifications()
-        self.assertEqual(
-            config.canonical.noreply_from_address, notification["From"])
-        self.assertEqual(
-            "Requester <%s>" % requester.preferredemail.email,
-            notification["To"])
-        subject = notification["Subject"].replace("\n ", " ")
-        self.assertEqual("Store release failed for test-snap", subject)
-        self.assertEqual(
-            "Requester @requester-team",
-            notification["X-Launchpad-Message-Rationale"])
-        self.assertEqual(
-            requester_team.name, notification["X-Launchpad-Message-For"])
-        self.assertEqual(
-            "snap-build-release-failed",
-            notification["X-Launchpad-Notification-Type"])
-        body, footer = notification.get_payload(decode=True).split("\n-- \n")
-        self.assertIn("Failed to publish", body)
-        self.assertIn(self.store_url, body)
-        self.assertEqual(
-            "http://launchpad.test/~requester-team/+snap/test-snap/+build/%d\n"
-            "Your team Requester Team is the requester of the build.\n" %
-            snapbuild.id, footer)
-        self.assertWebhookDeliveries(
-            snapbuild, ["Pending", "Failed to release to channels"])
-
     def test_retry_delay(self):
         # The job is retried every minute, unless it just made one of its
         # first four attempts to poll the status endpoint, in which case the
@@ -655,15 +538,12 @@
         client = FakeSnapStoreClient()
         client.upload.result = self.status_url
         client.checkStatus.result = (self.store_url, 1)
-        client.release.failure = UploadFailedResponse(
-            "Proxy error", can_retry=True)
         self.useFixture(ZopeUtilityFixture(client, ISnapStoreClient))
         with dbuser(config.ISnapStoreUploadJobSource.dbuser):
             JobRunner([job]).runAll()
 
         previous_upload = client.upload.calls
         previous_checkStatus = client.checkStatus.calls
-        len_previous_release = len(client.release.calls)
 
         # Check we uploaded as expected
         self.assertEqual(self.store_url, job.store_url)
@@ -676,10 +556,10 @@
         with dbuser(config.ISnapStoreUploadJobSource.dbuser):
             JobRunner([job]).runAll()
 
-        # We should not have called `upload`, but moved straight to `release`
+        # Release is not called due to release intent in upload
+        # but ensure that we have not called upload twice
         self.assertEqual(previous_upload, client.upload.calls)
         self.assertEqual(previous_checkStatus, client.checkStatus.calls)
-        self.assertEqual(len_previous_release + 1, len(client.release.calls))
         self.assertIsNone(job.error_message)
 
     def test_with_snapbuild_metadata_as_none(self):

=== modified file 'lib/lp/snappy/tests/test_snapstoreclient.py'
--- lib/lp/snappy/tests/test_snapstoreclient.py	2019-06-14 14:49:25 +0000
+++ lib/lp/snappy/tests/test_snapstoreclient.py	2019-06-19 16:07:26 +0000
@@ -47,7 +47,6 @@
     BadScanStatusResponse,
     BadSearchResponse,
     ISnapStoreClient,
-    ReleaseFailedResponse,
     ScanFailedResponse,
     UnauthorizedUploadResponse,
     UploadFailedResponse,
@@ -282,20 +281,6 @@
         self.addCleanup(
             getUtility(IMemcacheClient).delete, self.channels_memcache_key)
 
-    def _addSnapReleaseResponse(self):
-        responses.add(
-            "POST", "http://sca.example/dev/api/snap-release/",
-            json={
-                "success": True,
-                "channel_map": [
-                    {"channel": "stable", "info": "specific",
-                     "version": "1.0", "revision": 1},
-                    {"channel": "edge", "info": "specific",
-                     "version": "1.0", "revision": 1},
-                    ],
-                "opened_channels": ["stable", "edge"],
-                })
-
     @responses.activate
     def test_requestPackageUploadPermission(self):
         snappy_series = self.factory.makeSnappySeries(name="rolling")
@@ -402,6 +387,41 @@
             ]))
 
     @responses.activate
+    def test_upload_with_release_intent(self):
+        snapbuild = self.makeUploadableSnapBuild()
+        snapbuild.snap.store_channels = ['beta', 'edge']
+        transaction.commit()
+        self._addUnscannedUploadResponse()
+        self._addSnapPushResponse()
+        with dbuser(config.ISnapStoreUploadJobSource.dbuser):
+            self.assertEqual(
+                "http://sca.example/dev/api/snaps/1/builds/1/status",
+                self.client.upload(snapbuild))
+        requests = [call.request for call in responses.calls]
+        self.assertThat(requests, MatchesListwise([
+            RequestMatches(
+                url=Equals("http://updown.example/unscanned-upload/"),
+                method=Equals("POST"),
+                form_data={
+                    "binary": MatchesStructure.byEquality(
+                        name="binary", filename="test-snap.snap",
+                        value="dummy snap content",
+                        type="application/octet-stream",
+                        )}),
+            RequestMatches(
+                url=Equals("http://sca.example/dev/api/snap-push/"),
+                method=Equals("POST"),
+                headers=ContainsDict(
+                    {"Content-Type": Equals("application/json")}),
+                auth=("Macaroon", MacaroonsVerify(self.root_key)),
+                json_data={
+                    "name": "test-snap", "updown_id": 1, "series": "rolling",
+                    "built_at": snapbuild.date_started.isoformat(),
+                    "only_if_newer": True, "channels": ['beta', 'edge'],
+                    }),
+            ]))
+
+    @responses.activate
     def test_upload_no_discharge(self):
         root_key = hashlib.sha256(self.factory.getUniqueString()).hexdigest()
         root_macaroon = Macaroon(key=root_key)
@@ -638,100 +658,3 @@
         self.assertContentEqual([], responses.calls)
         self.assertIsNone(
             getUtility(IMemcacheClient).get(self.channels_memcache_key))
-
-    @responses.activate
-    def test_release(self):
-        snap = self.factory.makeSnap(
-            store_upload=True,
-            store_series=self.factory.makeSnappySeries(name="rolling"),
-            store_name="test-snap",
-            store_secrets=self._make_store_secrets(),
-            store_channels=["stable", "edge"])
-        snapbuild = self.factory.makeSnapBuild(snap=snap)
-        self._addSnapReleaseResponse()
-        self.client.release(snapbuild, 1)
-        self.assertThat(responses.calls[-1].request, RequestMatches(
-            url=Equals("http://sca.example/dev/api/snap-release/"),
-            method=Equals("POST"),
-            headers=ContainsDict({"Content-Type": Equals("application/json")}),
-            auth=("Macaroon", MacaroonsVerify(self.root_key)),
-            json_data={
-                "name": "test-snap", "revision": 1,
-                "channels": ["stable", "edge"], "series": "rolling",
-                }))
-
-    @responses.activate
-    def test_release_no_discharge(self):
-        root_key = hashlib.sha256(self.factory.getUniqueString()).hexdigest()
-        root_macaroon = Macaroon(key=root_key)
-        snap = self.factory.makeSnap(
-            store_upload=True,
-            store_series=self.factory.makeSnappySeries(name="rolling"),
-            store_name="test-snap",
-            store_secrets={"root": root_macaroon.serialize()},
-            store_channels=["stable", "edge"])
-        snapbuild = self.factory.makeSnapBuild(snap=snap)
-        self._addSnapReleaseResponse()
-        self.client.release(snapbuild, 1)
-        self.assertThat(responses.calls[-1].request, RequestMatches(
-            url=Equals("http://sca.example/dev/api/snap-release/"),
-            method=Equals("POST"),
-            headers=ContainsDict({"Content-Type": Equals("application/json")}),
-            auth=("Macaroon", MacaroonsVerify(root_key)),
-            json_data={
-                "name": "test-snap", "revision": 1,
-                "channels": ["stable", "edge"], "series": "rolling",
-                }))
-
-    @responses.activate
-    def test_release_needs_discharge_macaroon_refresh(self):
-        store_secrets = self._make_store_secrets()
-        snap = self.factory.makeSnap(
-            store_upload=True,
-            store_series=self.factory.makeSnappySeries(name="rolling"),
-            store_name="test-snap", store_secrets=store_secrets,
-            store_channels=["stable", "edge"])
-        snapbuild = self.factory.makeSnapBuild(snap=snap)
-        responses.add(
-            "POST", "http://sca.example/dev/api/snap-release/", status=401,
-            headers={"WWW-Authenticate": "Macaroon needs_refresh=1"})
-        self._addMacaroonRefreshResponse()
-        self._addSnapReleaseResponse()
-        self.client.release(snapbuild, 1)
-        requests = [call.request for call in responses.calls]
-        self.assertThat(requests, MatchesListwise([
-            MatchesStructure.byEquality(path_url="/dev/api/snap-release/"),
-            MatchesStructure.byEquality(path_url="/api/v2/tokens/refresh"),
-            MatchesStructure.byEquality(path_url="/dev/api/snap-release/"),
-            ]))
-        self.assertNotEqual(
-            store_secrets["discharge"], snap.store_secrets["discharge"])
-
-    @responses.activate
-    def test_release_error(self):
-        snap = self.factory.makeSnap(
-            store_upload=True,
-            store_series=self.factory.makeSnappySeries(name="rolling"),
-            store_name="test-snap", store_secrets=self._make_store_secrets(),
-            store_channels=["stable", "edge"])
-        snapbuild = self.factory.makeSnapBuild(snap=snap)
-        responses.add(
-            "POST", "http://sca.example/dev/api/snap-release/", status=503,
-            json={"error_list": [{"message": "Failed to publish"}]})
-        self.assertRaisesWithContent(
-            ReleaseFailedResponse, "Failed to publish",
-            self.client.release, snapbuild, 1)
-
-    @responses.activate
-    def test_release_404(self):
-        snap = self.factory.makeSnap(
-            store_upload=True,
-            store_series=self.factory.makeSnappySeries(name="rolling"),
-            store_name="test-snap", store_secrets=self._make_store_secrets(),
-            store_channels=["stable", "edge"])
-        snapbuild = self.factory.makeSnapBuild(snap=snap)
-        responses.add(
-            "POST", "http://sca.example/dev/api/snap-release/", status=404)
-        self.assertRaisesWithContent(
-            ReleaseFailedResponse, b"404 Client Error: Not Found",
-            self.client.release, snapbuild, 1)