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

[Tom Wardill]

Add built_at to snap upload metadata

Allow rejecting of misordered builds at the store level by sending the time for the build start.

[Colin Watson (cjwatson)]

Style nit throughout which I haven't commented in every location: when you have a multi-line list or dict, please put a trailing comma on every item rather than on all but the last, in order that future changes can have smaller diffs.

review: Needs Fixing

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'lib/lp/snappy/model/snapstoreclient.py'
--- lib/lp/snappy/model/snapstoreclient.py	2018-12-10 13:54:34 +0000
+++ lib/lp/snappy/model/snapstoreclient.py	2019-06-14 14:46:36 +0000
@@ -253,15 +253,18 @@
             lfa.close()
 
     @classmethod
-    def _uploadApp(cls, snap, upload_data):
+    def _uploadApp(cls, snapbuild, upload_data):
         """Create a new store upload based on the uploaded file."""
+        snap = snapbuild.snap
         assert config.snappy.store_url is not None
         assert snap.store_name is not None
+        assert snapbuild.date_started is not None
         upload_url = urlappend(config.snappy.store_url, "dev/api/snap-push/")
         data = {
             "name": snap.store_name,
             "updown_id": upload_data["upload_id"],
             "series": snap.store_series.name,
+            "built_at": snapbuild.date_started.isoformat(),
             }
         # XXX cjwatson 2016-05-09: This should add timeline information, but
         # that's currently difficult in jobs.
@@ -293,7 +296,7 @@
                 continue
             upload_data = cls._uploadFile(lfa, lfc)
             return cls.refreshIfNecessary(
-                snapbuild.snap, cls._uploadApp, snapbuild.snap, upload_data)
+                snapbuild.snap, cls._uploadApp, snapbuild, upload_data)
 
     @classmethod
     def refreshDischargeMacaroon(cls, snap):
 
=== modified file 'lib/lp/snappy/tests/test_snapstoreclient.py'
--- lib/lp/snappy/tests/test_snapstoreclient.py	2019-06-14 14:26:30 +0000
+++ lib/lp/snappy/tests/test_snapstoreclient.py	2019-06-14 14:46:36 +0000
@@ -35,6 +35,7 @@
 import transaction
 from zope.component import getUtility
 
+from lp.buildmaster.enums import BuildStatus
 from lp.services.config import config
 from lp.services.features.testing import FeatureFixture
 from lp.services.log.logger import BufferLogger
@@ -363,6 +364,8 @@
             filename="test-snap.manifest", content="dummy manifest content")
         self.factory.makeSnapFile(
             snapbuild=snapbuild, libraryfile=manifest_lfa)
+        snapbuild.updateStatus(BuildStatus.BUILDING)
+        snapbuild.updateStatus(BuildStatus.FULLYBUILT)
         return snapbuild
 
     @responses.activate
@@ -394,6 +397,7 @@
                 auth=("Macaroon", MacaroonsVerify(self.root_key)),
                 json_data={
                     "name": "test-snap", "updown_id": 1, "series": "rolling",
+                    "built_at": snapbuild.date_started.isoformat(),
                     }),
             ]))
 
@@ -429,6 +433,7 @@
                 auth=("Macaroon", MacaroonsVerify(root_key)),
                 json_data={
                     "name": "test-snap", "updown_id": 1, "series": "rolling",
+                    "built_at": snapbuild.date_started.isoformat(),
                     }),
             ]))