Merge lp:~matiasb/launchpad-buildd/set-build-request-id-prefix into lp:launchpad-buildd

[Matias Bordese]

Updated build-request-id tag to set lp prefix.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'lpbuildd/target/build_snap.py'
--- lpbuildd/target/build_snap.py	2019-04-26 13:14:13 +0000
+++ lpbuildd/target/build_snap.py	2019-05-08 14:54:02 +0000
@@ -202,7 +202,8 @@
     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"] = 'lp-{}'.format(
+                self.args.build_request_id)
         if self.args.build_request_timestamp is not None:
             data["build-request-timestamp"] = self.args.build_request_timestamp
         if self.args.build_url is not None:
 
=== modified file 'lpbuildd/target/tests/test_build_snap.py'
--- lpbuildd/target/tests/test_build_snap.py	2019-04-26 13:14:13 +0000
+++ lpbuildd/target/tests/test_build_snap.py	2019-05-08 14:54:02 +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": "lp-13"}',
                 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": "lp-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": "lp-13",'
                     ' "build_url": "https://launchpad.example/build"}'),
                 SNAPCRAFT_BUILD_ENVIRONMENT="host")),
             ))