launchpad-buildd

Merge lp:~matiasb/launchpad-buildd/rename-build-request-fields into lp:launchpad-buildd

  1. rename-build-request-fields
  2. Merge into trunk
Proposed by Matias Bordese
Status: Merged
Merged at revision: 374
Proposed branch: lp:~matiasb/launchpad-buildd/rename-build-request-fields
Merge into: lp:launchpad-buildd
Diff against target: 54 lines (+6/-6)
2 files modified
lpbuildd/target/build_snap.py (+2/-2)
lpbuildd/target/tests/test_build_snap.py (+4/-4)
To merge this branch: bzr merge lp:~matiasb/launchpad-buildd/rename-build-request-fields
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+366565@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lpbuildd/target/build_snap.py'
2--- lpbuildd/target/build_snap.py 2019-04-25 13:44:38 +0000
3+++ lpbuildd/target/build_snap.py 2019-04-26 13:15:50 +0000
4@@ -202,9 +202,9 @@
5 def image_info(self):
6 data = {}
7 if self.args.build_request_id is not None:
8- data["build_request_id"] = self.args.build_request_id
9+ data["build-request-id"] = self.args.build_request_id
10 if self.args.build_request_timestamp is not None:
11- data["build_request_timestamp"] = self.args.build_request_timestamp
12+ data["build-request-timestamp"] = self.args.build_request_timestamp
13 if self.args.build_url is not None:
14 data["build_url"] = self.args.build_url
15 return json.dumps(data, sort_keys=True)
16
17=== modified file 'lpbuildd/target/tests/test_build_snap.py'
18--- lpbuildd/target/tests/test_build_snap.py 2019-04-25 13:44:38 +0000
19+++ lpbuildd/target/tests/test_build_snap.py 2019-04-26 13:15:50 +0000
20@@ -460,7 +460,7 @@
21 RanBuildCommand(
22 ["snapcraft"], cwd="/build/test-snap",
23 SNAPCRAFT_BUILD_INFO="1",
24- SNAPCRAFT_IMAGE_INFO='{"build_request_id": "13"}',
25+ SNAPCRAFT_IMAGE_INFO='{"build-request-id": "13"}',
26 SNAPCRAFT_BUILD_ENVIRONMENT="host"),
27 ]))
28
29@@ -478,7 +478,7 @@
30 ["snapcraft"], cwd="/build/test-snap",
31 SNAPCRAFT_BUILD_INFO="1",
32 SNAPCRAFT_IMAGE_INFO=(
33- '{"build_request_timestamp": "2018-04-13T14:50:02Z"}'),
34+ '{"build-request-timestamp": "2018-04-13T14:50:02Z"}'),
35 SNAPCRAFT_BUILD_ENVIRONMENT="host"),
36 ]))
37
38@@ -506,14 +506,14 @@
39 SNAPCRAFT_LOCAL_SOURCES="1", SNAPCRAFT_SETUP_CORE="1",
40 SNAPCRAFT_BUILD_INFO="1",
41 SNAPCRAFT_IMAGE_INFO=(
42- '{"build_request_id": "13",'
43+ '{"build-request-id": "13",'
44 ' "build_url": "https://launchpad.example/build"}'),
45 SNAPCRAFT_BUILD_ENVIRONMENT="host")),
46 AnyMatch(RanBuildCommand(
47 ["snapcraft"], cwd="/build/test-snap",
48 SNAPCRAFT_BUILD_INFO="1",
49 SNAPCRAFT_IMAGE_INFO=(
50- '{"build_request_id": "13",'
51+ '{"build-request-id": "13",'
52 ' "build_url": "https://launchpad.example/build"}'),
53 SNAPCRAFT_BUILD_ENVIRONMENT="host")),
54 ))

Subscribers

People subscribed via source and target branches