launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #21263
[Merge] lp:~cjwatson/launchpad-buildd/control-dbgsym-via-env into lp:launchpad-buildd
Colin Watson has proposed merging lp:~cjwatson/launchpad-buildd/control-dbgsym-via-env into lp:launchpad-buildd.
Commit message:
lpbuildd.binarypackage: Pass DEB_BUILD_OPTIONS=noautodbgsym if we have not been told to build debug symbols (LP: #1623256).
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
Related bugs:
Bug #1623256 in launchpad-buildd: "adjust the way to create dbgsym packages like Debian does"
https://bugs.launchpad.net/launchpad-buildd/+bug/1623256
For more details, see:
https://code.launchpad.net/~cjwatson/launchpad-buildd/control-dbgsym-via-env/+merge/312356
--
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad-buildd/control-dbgsym-via-env into lp:launchpad-buildd.
=== modified file 'debian/changelog'
--- debian/changelog 2016-11-30 10:20:32 +0000
+++ debian/changelog 2016-12-02 14:30:11 +0000
@@ -2,6 +2,8 @@
* buildsnap: Grant access to the proxy during the build phase as well as
during the pull phase (LP: #1642281).
+ * lpbuildd.binarypackage: Pass DEB_BUILD_OPTIONS=noautodbgsym if we have
+ not been told to build debug symbols (LP: #1623256).
-- Colin Watson <cjwatson@xxxxxxxxxx> Fri, 04 Nov 2016 10:47:41 +0000
=== modified file 'lpbuildd/binarypackage.py'
--- lpbuildd/binarypackage.py 2016-02-18 14:44:09 +0000
+++ lpbuildd/binarypackage.py 2016-12-02 14:30:11 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009, 2010 Canonical Ltd. This software is licensed under the
+# Copyright 2009-2016 Canonical Ltd. This software is licensed under the
# GNU Affero General Public License version 3 (see the file LICENSE).
from __future__ import absolute_import
@@ -145,7 +145,10 @@
if self.arch_indep:
args.append("-A")
args.append(self._dscfile)
- self.runSubProcess(self._sbuildpath, args)
+ env = dict(os.environ)
+ if not self.build_debug_symbols:
+ env["DEB_BUILD_OPTIONS"] = "noautodbgsym"
+ self.runSubProcess(self._sbuildpath, args, env=env)
def getAvailablePackages(self):
"""Return the available binary packages in the chroot.
=== modified file 'lpbuildd/tests/test_binarypackage.py'
--- lpbuildd/tests/test_binarypackage.py 2015-08-04 20:57:12 +0000
+++ lpbuildd/tests/test_binarypackage.py 2016-12-02 14:30:11 +0000
@@ -1,4 +1,4 @@
-# Copyright 2013 Canonical Ltd. This software is licensed under the
+# Copyright 2013-2016 Canonical Ltd. This software is licensed under the
# GNU Affero General Public License version 3 (see the file LICENSE).
__metaclass__ = type
@@ -11,10 +11,12 @@
from debian.deb822 import PkgRelation
from testtools import TestCase
from testtools.matchers import (
+ Contains,
ContainsDict,
Equals,
Is,
MatchesListwise,
+ Not,
)
from twisted.internet.task import Clock
@@ -48,8 +50,8 @@
self.iterators = []
self.arch_indep = False
- def runSubProcess(self, path, command, iterate=None):
- self.commands.append([path]+command)
+ def runSubProcess(self, path, command, iterate=None, env=None):
+ self.commands.append(([path] + command, env))
if iterate is None:
iterate = self.iterate
self.iterators.append(iterate)
@@ -111,12 +113,14 @@
self.buildid, 'i386', 'warty', '-c', 'chroot:autobuild',
'--arch=i386', '--dist=warty', '--purge=never', '--nolog',
'foo_1.dsc',
- ], True)
+ ], final=True)
self.assertFalse(self.slave.wasCalled('chrootFail'))
- def assertState(self, state, command, final):
+ def assertState(self, state, command, env_matcher=None, final=False):
self.assertEqual(state, self.getState())
- self.assertEqual(command, self.buildmanager.commands[-1])
+ self.assertEqual(command, self.buildmanager.commands[-1][0])
+ if env_matcher is not None:
+ self.assertThat(self.buildmanager.commands[-1][1], env_matcher)
if final:
self.assertEqual(
self.buildmanager.iterate, self.buildmanager.iterators[-1])
@@ -130,14 +134,14 @@
self.assertState(
BinaryPackageBuildState.SBUILD,
['sharepath/slavebin/scan-for-processes', 'scan-for-processes',
- self.buildid], False)
+ self.buildid], final=False)
def assertUnmountsSanely(self):
self.buildmanager.iterateReap(self.getState(), 0)
self.assertState(
BinaryPackageBuildState.UMOUNT,
['sharepath/slavebin/umount-chroot', 'umount-chroot',
- self.buildid], True)
+ self.buildid], final=True)
def test_iterate(self):
# The build manager iterates a normal build from start to finish.
@@ -161,6 +165,63 @@
self.assertUnmountsSanely()
self.assertFalse(self.slave.wasCalled('buildFail'))
+ def test_with_debug_symbols(self):
+ # A build with debug symbols sets up /CurrentlyBuilding
+ # appropriately, and does not pass DEB_BUILD_OPTIONS.
+ self.buildmanager.initiate(
+ {'foo_1.dsc': ''}, 'chroot.tar.gz',
+ {'distribution': 'ubuntu', 'suite': 'warty',
+ 'ogrecomponent': 'main', 'archive_purpose': 'PRIMARY',
+ 'build_debug_symbols': True})
+ os.makedirs(self.chrootdir)
+ self.buildmanager._state = BinaryPackageBuildState.UPDATE
+ self.buildmanager.iterate(0)
+ self.assertState(
+ BinaryPackageBuildState.SBUILD,
+ ['sharepath/slavebin/sbuild-package', 'sbuild-package',
+ self.buildid, 'i386', 'warty', '-c', 'chroot:autobuild',
+ '--arch=i386', '--dist=warty', '--purge=never', '--nolog',
+ 'foo_1.dsc'],
+ env_matcher=Not(Contains('DEB_BUILD_OPTIONS')), final=True)
+ self.assertFalse(self.slave.wasCalled('chrootFail'))
+ with open(os.path.join(self.chrootdir, 'CurrentlyBuilding')) as cb:
+ self.assertEqual(dedent("""\
+ Package: foo
+ Component: main
+ Suite: warty
+ Purpose: PRIMARY
+ Build-Debug-Symbols: yes
+ """), cb.read())
+
+ def test_without_debug_symbols(self):
+ # A build with debug symbols sets up /CurrentlyBuilding
+ # appropriately, and passes DEB_BUILD_OPTIONS=noautodbgsym.
+ self.buildmanager.initiate(
+ {'foo_1.dsc': ''}, 'chroot.tar.gz',
+ {'distribution': 'ubuntu', 'suite': 'warty',
+ 'ogrecomponent': 'main', 'archive_purpose': 'PRIMARY',
+ 'build_debug_symbols': False})
+ os.makedirs(self.chrootdir)
+ self.buildmanager._state = BinaryPackageBuildState.UPDATE
+ self.buildmanager.iterate(0)
+ self.assertState(
+ BinaryPackageBuildState.SBUILD,
+ ['sharepath/slavebin/sbuild-package', 'sbuild-package',
+ self.buildid, 'i386', 'warty', '-c', 'chroot:autobuild',
+ '--arch=i386', '--dist=warty', '--purge=never', '--nolog',
+ 'foo_1.dsc'],
+ env_matcher=ContainsDict(
+ {'DEB_BUILD_OPTIONS': Equals('noautodbgsym')}),
+ final=True)
+ self.assertFalse(self.slave.wasCalled('chrootFail'))
+ with open(os.path.join(self.chrootdir, 'CurrentlyBuilding')) as cb:
+ self.assertEqual(dedent("""\
+ Package: foo
+ Component: main
+ Suite: warty
+ Purpose: PRIMARY
+ """), cb.read())
+
def test_abort_sbuild(self):
# Aborting sbuild kills processes in the chroot.
self.startBuild()
@@ -170,7 +231,7 @@
self.assertState(
BinaryPackageBuildState.SBUILD,
['sharepath/slavebin/scan-for-processes', 'scan-for-processes',
- self.buildid], False)
+ self.buildid], final=False)
self.assertFalse(self.slave.wasCalled('buildFail'))
# If reaping completes successfully, the build manager returns
@@ -189,7 +250,7 @@
self.assertState(
BinaryPackageBuildState.SBUILD,
['sharepath/slavebin/scan-for-processes', 'scan-for-processes',
- self.buildid], False)
+ self.buildid], final=False)
self.assertFalse(self.slave.wasCalled('builderFail'))
reap_subprocess = self.buildmanager._subprocess
@@ -213,7 +274,7 @@
self.assertState(
BinaryPackageBuildState.UMOUNT,
['sharepath/slavebin/umount-chroot', 'umount-chroot',
- self.buildid], True)
+ self.buildid], final=True)
def test_abort_between_subprocesses(self):
# If a build is aborted between subprocesses, the build manager
@@ -227,13 +288,13 @@
self.assertState(
BinaryPackageBuildState.INIT,
['sharepath/slavebin/scan-for-processes', 'scan-for-processes',
- self.buildid], False)
+ self.buildid], final=False)
self.buildmanager.iterate(0)
self.assertState(
BinaryPackageBuildState.CLEANUP,
['sharepath/slavebin/remove-build', 'remove-build', self.buildid],
- True)
+ final=True)
self.assertFalse(self.slave.wasCalled('builderFail'))
def test_missing_changes(self):
=== modified file 'sbuild-package'
--- sbuild-package 2016-03-03 16:33:19 +0000
+++ sbuild-package 2016-12-02 14:30:11 +0000
@@ -67,7 +67,7 @@
echo "Initiating build $BUILDID with $NR_PROCESSORS jobs across $ACTUAL_NR_PROCESSORS processor cores."
if [ $NR_PROCESSORS -gt 1 ]; then
- export DEB_BUILD_OPTIONS=parallel=$NR_PROCESSORS
+ export DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS:+$DEB_BUILD_OPTIONS }parallel=$NR_PROCESSORS"
fi
cd "$HOME/build-$BUILDID"
