launchpad-reviewers team mailing list archive

[Matias Bordese <matias.bordese@xxxxxxxxxxxxx>]

Matias Bordese has proposed merging lp:~matiasb/launchpad-buildd/rename-build-request-fields into lp:launchpad-buildd.

Commit message:
Updated build request fields in SNAPCRAFT_IMAGE_INFO to use dash as separator.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~matiasb/launchpad-buildd/rename-build-request-fields/+merge/366565
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~matiasb/launchpad-buildd/rename-build-request-fields into lp:launchpad-buildd.

=== modified file 'lpbuildd/target/build_snap.py'
--- lpbuildd/target/build_snap.py	2019-04-25 13:44:38 +0000
+++ lpbuildd/target/build_snap.py	2019-04-26 13:15:50 +0000
@@ -202,9 +202,9 @@
     def image_info(self):
         data = {}
         if self.args.build_request_id is not None:
-            data["build_request_id"] = self.args.build_request_id
+            data["build-request-id"] = self.args.build_request_id
         if self.args.build_request_timestamp is not None:
-            data["build_request_timestamp"] = self.args.build_request_timestamp
+            data["build-request-timestamp"] = self.args.build_request_timestamp
         if self.args.build_url is not None:
             data["build_url"] = self.args.build_url
         return json.dumps(data, sort_keys=True)

=== modified file 'lpbuildd/target/tests/test_build_snap.py'
--- lpbuildd/target/tests/test_build_snap.py	2019-04-25 13:44:38 +0000
+++ lpbuildd/target/tests/test_build_snap.py	2019-04-26 13:15:50 +0000
@@ -460,7 +460,7 @@
             RanBuildCommand(
                 ["snapcraft"], cwd="/build/test-snap",
                 SNAPCRAFT_BUILD_INFO="1",
-                SNAPCRAFT_IMAGE_INFO='{"build_request_id": "13"}',
+                SNAPCRAFT_IMAGE_INFO='{"build-request-id": "13"}',
                 SNAPCRAFT_BUILD_ENVIRONMENT="host"),
             ]))
 
@@ -478,7 +478,7 @@
                 ["snapcraft"], cwd="/build/test-snap",
                 SNAPCRAFT_BUILD_INFO="1",
                 SNAPCRAFT_IMAGE_INFO=(
-                    '{"build_request_timestamp": "2018-04-13T14:50:02Z"}'),
+                    '{"build-request-timestamp": "2018-04-13T14:50:02Z"}'),
                 SNAPCRAFT_BUILD_ENVIRONMENT="host"),
             ]))
 
@@ -506,14 +506,14 @@
                 SNAPCRAFT_LOCAL_SOURCES="1", SNAPCRAFT_SETUP_CORE="1",
                 SNAPCRAFT_BUILD_INFO="1",
                 SNAPCRAFT_IMAGE_INFO=(
-                    '{"build_request_id": "13",'
+                    '{"build-request-id": "13",'
                     ' "build_url": "https://launchpad.example/build"}'),
                 SNAPCRAFT_BUILD_ENVIRONMENT="host")),
             AnyMatch(RanBuildCommand(
                 ["snapcraft"], cwd="/build/test-snap",
                 SNAPCRAFT_BUILD_INFO="1",
                 SNAPCRAFT_IMAGE_INFO=(
-                    '{"build_request_id": "13",'
+                    '{"build-request-id": "13",'
                     ' "build_url": "https://launchpad.example/build"}'),
                 SNAPCRAFT_BUILD_ENVIRONMENT="host")),
             ))