Merge lp:~cjwatson/launchpad/series-for-all-builds into lp:launchpad

Proposed by Colin Watson
Status: Merged
Merged at revision: 18441
Proposed branch: lp:~cjwatson/launchpad/series-for-all-builds
Merge into: lp:launchpad
Diff against target: 73 lines (+9/-0)
4 files modified
lib/lp/code/model/recipebuilder.py (+4/-0)
lib/lp/code/model/tests/test_recipebuilder.py (+3/-0)
lib/lp/soyuz/model/binarypackagebuildbehaviour.py (+1/-0)
lib/lp/soyuz/tests/test_binarypackagebuildbehaviour.py (+1/-0)
To merge this branch: bzr merge lp:~cjwatson/launchpad/series-for-all-builds
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+328097@code.launchpad.net

Commit message

Pass the series name in a "series" argument to all build types, making it easier to use it in common code in launchpad-buildd.

Description of the change

I realised I wanted this when working on consolidating some duplicated code in launchpad-buildd. unpack-debian-chroot looks at $SUITE, but nobody ever noticed that nothing actually passes a suite to it; furthermore, what it really wants is the series name. Although the specific use case there (--uname-2.6) is almost obsolete, it's conceptually reasonable for it to have this information, and it's better for buildd-manager to pass it directly than to have launchpad-buildd get at the suite in build-type-dependent ways and parse it itself.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/code/model/recipebuilder.py'
2--- lib/lp/code/model/recipebuilder.py 2017-04-29 23:51:28 +0000
3+++ lib/lp/code/model/recipebuilder.py 2017-07-26 13:45:32 +0000
4@@ -48,6 +48,7 @@
5 """
6 # Build extra arguments.
7 args = {}
8+ args['series'] = self.build.distroseries.name
9 args['suite'] = self.build.distroseries.getSuite(self.build.pocket)
10 args['arch_tag'] = distroarchseries.architecturetag
11 requester = self.build.requester
12@@ -73,6 +74,9 @@
13 tools_source=config.builddmaster.bzr_builder_sources_list,
14 logger=logger))
15 args['archive_private'] = self.build.archive.private
16+ # XXX cjwatson 2017-07-26: This duplicates "series", which is common
17+ # to all build types; this name for it is deprecated and should be
18+ # removed once launchpad-buildd no longer requires it.
19 args['distroseries_name'] = self.build.distroseries.name
20 if self.build.recipe.base_git_repository is not None:
21 args['git'] = True
22
23=== modified file 'lib/lp/code/model/tests/test_recipebuilder.py'
24--- lib/lp/code/model/tests/test_recipebuilder.py 2017-04-29 23:51:28 +0000
25+++ lib/lp/code/model/tests/test_recipebuilder.py 2017-07-26 13:45:32 +0000
26@@ -182,6 +182,7 @@
27 'archive_private': False,
28 'arch_tag': 'i386',
29 'author_email': u'requester@ubuntu.com',
30+ 'series': job.build.distroseries.name,
31 'suite': u'mydistro',
32 'author_name': u'Joe User',
33 'archive_purpose': 'PPA',
34@@ -274,6 +275,7 @@
35 'archive_private': False,
36 'arch_tag': 'i386',
37 'author_email': u'requester@ubuntu.com',
38+ 'series': job.build.distroseries.name,
39 'suite': u'mydistro',
40 'author_name': u'Joe User',
41 'archive_purpose': 'PPA',
42@@ -314,6 +316,7 @@
43 'archive_private': False,
44 'arch_tag': 'i386',
45 'author_email': u'requester@ubuntu.com',
46+ 'series': job.build.distroseries.name,
47 'suite': u'mydistro',
48 'author_name': u'Joe User',
49 'archive_purpose': 'PPA',
50
51=== modified file 'lib/lp/soyuz/model/binarypackagebuildbehaviour.py'
52--- lib/lp/soyuz/model/binarypackagebuildbehaviour.py 2017-04-29 23:51:28 +0000
53+++ lib/lp/soyuz/model/binarypackagebuildbehaviour.py 2017-07-26 13:45:32 +0000
54@@ -144,6 +144,7 @@
55 args = {}
56 args['arch_indep'] = build.arch_indep
57 args['distribution'] = das.distroseries.distribution.name
58+ args['series'] = das.distroseries.name
59 args['suite'] = das.distroseries.getSuite(build.pocket)
60 args['arch_tag'] = das.architecturetag
61
62
63=== modified file 'lib/lp/soyuz/tests/test_binarypackagebuildbehaviour.py'
64--- lib/lp/soyuz/tests/test_binarypackagebuildbehaviour.py 2017-04-29 23:51:28 +0000
65+++ lib/lp/soyuz/tests/test_binarypackagebuildbehaviour.py 2017-07-26 13:45:32 +0000
66@@ -140,6 +140,7 @@
67 'build_debug_symbols': archive.build_debug_symbols,
68 'ogrecomponent': component,
69 'distribution': das.distroseries.distribution.name,
70+ 'series': ds_name,
71 'suite': suite,
72 'trusted_keys': trusted_keys,
73 }