Merge lp:~cjwatson/launchpad-buildd/unhardcode-distribution into lp:launchpad-buildd

[Colin Watson]

Expect a "distribution" argument in binarypackage and pass it to sbuild's --archive option (LP: #1348077).

The other half of https://code.launchpad.net/~cjwatson/launchpad/bpbb-distribution/+merge/228093; if we get a "distribution" argument from the master for a binarypackage build, pass it to sbuild's (misnamed) --archive option. This will end up in the Distribution field in ddebs.txt, as well as in the no-longer-used translations.txt, removing ambiguity from the interface with ddeb-retriever.

[lp:~cjwatson/launchpad-buildd/unhardcode-distribution]

132. By Colin Watson on 2014-08-06

Launchpad always passes a "distribution" argument now.

133. By Colin Watson on 2014-08-06

Merge trunk.

134. By Colin Watson on 2014-08-06

Remove the hardcoded --archive=ubuntu from the configuration file.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-06 07:10:48 +0000
+++ debian/changelog	2014-08-06 08:01:43 +0000
@@ -3,6 +3,12 @@
   [ Colin Watson ]
   * Build with dpkg-deb -Zgzip, so that the resulting .deb can still be
     installed on lucid.
+  * Drop support for running binarypackage builds without a "suite"
+    argument; Launchpad has passed this for all binarypackage builds since
+    2007.
+  * Expect a "distribution" argument in binarypackage and pass it to
+    sbuild's --archive option (LP: #1348077).  Remove the hardcoded
+    --archive=ubuntu from the configuration file.
 
   [ William Grant ]
   * Remove the 1GB RLIMIT_AS for recipe builds. All virtual builders now have

=== modified file 'debian/upgrade-config'
--- debian/upgrade-config	2013-12-13 14:02:02 +0000
+++ debian/upgrade-config	2014-08-06 08:01:43 +0000
@@ -142,6 +142,20 @@
     in_file.close()
     out_file.close()
 
+def upgrade_to_126():
+    print "Upgrading %s to version 126" % conf_file
+    subprocess.call(["mv", conf_file, conf_file+"-prev126~"])
+    in_file = open(conf_file+"-prev126~", "r")
+    out_file = open(conf_file, "w")
+    archive_ubuntu = " --archive=ubuntu"
+    for line in in_file:
+        line = line.rstrip("\n")
+        if line.endswith(archive_ubuntu):
+            line = line[:-len(archive_ubuntu)]
+        out_file.write(line + "\n")
+    in_file.close()
+    out_file.close()
+
 if __name__ == "__main__":
     old_version = re.sub(r'[~-].*', '', old_version)
     if int(old_version) < 12:
@@ -164,3 +178,5 @@
         upgrade_to_115()
     if int(old_version) < 120:
         upgrade_to_120()
+    if int(old_version) < 126:
+        upgrade_to_126()

=== modified file 'lpbuildd/binarypackage.py'
--- lpbuildd/binarypackage.py	2013-10-04 01:05:00 +0000
+++ lpbuildd/binarypackage.py	2014-08-06 08:01:43 +0000
@@ -56,7 +56,8 @@
             raise ValueError, files
 
         self.archive_purpose = extra_args.get('archive_purpose')
-        self.suite = extra_args.get('suite')
+        self.distribution = extra_args['distribution']
+        self.suite = extra_args['suite']
         self.component = extra_args['ogrecomponent']
         self.arch_indep = extra_args.get('arch_indep', False)
         self.build_debug_symbols = extra_args.get('build_debug_symbols', False)
@@ -67,23 +68,19 @@
     def doRunBuild(self):
         """Run the sbuild process to build the package."""
         args = ["sbuild-package", self._buildid, self.arch_tag]
-        if self.suite:
-            args.extend([self.suite])
-            args.extend(self._sbuildargs)
-            args.extend(["--dist=" + self.suite])
-        else:
-            args.extend(['autobuild'])
-            args.extend(self._sbuildargs)
-            args.extend(["--dist=autobuild"])
+        args.append(self.suite)
+        args.extend(self._sbuildargs)
+        args.append("--archive=" + self.distribution)
+        args.append("--dist=" + self.suite)
         if self.arch_indep:
-            args.extend(["-A"])
+            args.append("-A")
         if self.archive_purpose:
-            args.extend(["--purpose=" + self.archive_purpose])
+            args.append("--purpose=" + self.archive_purpose)
         if self.build_debug_symbols:
-            args.extend(["--build-debug-symbols"])
-        args.extend(["--architecture=" + self.arch_tag])
-        args.extend(["--comp=" + self.component])
-        args.extend([self._dscfile])
+            args.append("--build-debug-symbols")
+        args.append("--architecture=" + self.arch_tag)
+        args.append("--comp=" + self.component)
+        args.append(self._dscfile)
         self.runSubProcess( self._sbuildpath, args )
 
     def iterate_SBUILD(self, success):

=== modified file 'lpbuildd/tests/test_binarypackage.py'
--- lpbuildd/tests/test_binarypackage.py	2014-05-04 21:35:37 +0000
+++ lpbuildd/tests/test_binarypackage.py	2014-08-06 08:01:43 +0000
@@ -77,7 +77,8 @@
         # after INIT.
         self.buildmanager.initiate(
             {'foo_1.dsc': ''}, 'chroot.tar.gz',
-            {'suite': 'warty', 'ogrecomponent': 'main'})
+            {'distribution': 'ubuntu', 'suite': 'warty',
+             'ogrecomponent': 'main'})
 
         # Skip DebianBuildManager states to the state directly before
         # SBUILD.
@@ -88,8 +89,8 @@
         self.assertEqual(BinaryPackageBuildState.SBUILD, self.getState())
         expected_command = [
             'sbuildpath', 'sbuild-package', self.buildid, 'i386', 'warty',
-            'sbuildargs', '--dist=warty', '--architecture=i386', '--comp=main',
-            'foo_1.dsc',
+            'sbuildargs', '--archive=ubuntu', '--dist=warty',
+            '--architecture=i386', '--comp=main', 'foo_1.dsc',
             ]
         self.assertEqual(expected_command, self.buildmanager.commands[-1])
         self.assertEqual(
@@ -212,7 +213,8 @@
         # pretends that it was terminated by a signal.
         self.buildmanager.initiate(
             {'foo_1.dsc': ''}, 'chroot.tar.gz',
-            {'suite': 'warty', 'ogrecomponent': 'main'})
+            {'distribution': 'ubuntu', 'suite': 'warty',
+             'ogrecomponent': 'main'})
 
         self.buildmanager.abort()
         expected_command = [

=== modified file 'template-buildd-slave.conf'
--- template-buildd-slave.conf	2013-11-02 19:56:38 +0000
+++ template-buildd-slave.conf	2014-08-06 08:01:43 +0000
@@ -23,7 +23,7 @@
 
 [binarypackagemanager]
 sbuildpath = /usr/share/launchpad-buildd/slavebin/sbuild-package
-sbuildargs = --nolog --batch --archive=ubuntu
+sbuildargs = --nolog --batch
 
 [sourcepackagerecipemanager]
 buildrecipepath = /usr/share/launchpad-buildd/slavebin/buildrecipe