Merge lp:~wgrant/launchpad/no-buildd-ogre-model into lp:launchpad

[William Grant]

Remove obsolete slave-side ogre model support from launchpad-buildd.

This branch removes ogre model support from launchpad-buildd. The 'ogre model' refers to the layered layout of Ubuntu's components -- main can only depend on main, universe can depend on universe and main, etc.

apply-ogre-model used to look at the component name provided by the master, and from that decide which pre-built sources.list to use. But since the advent of PPAs, the master sends a list of sources.list entries, which is used by override-sources-list to clobber the slave-picked one.

Current chroots don't even have the pre-built sources.lists to select from any more, so apply-ogre-model does nothing and has been vestigial for three years. It's high time that it was removed.

[Graham Binns (gmb)]

review: Approve (code)

=== removed file 'lib/canonical/buildd/apply-ogre-model'
--- lib/canonical/buildd/apply-ogre-model	2009-06-30 21:06:27 +0000
+++ lib/canonical/buildd/apply-ogre-model	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-#
-# Author: Daniel Silverstone <[e-mail]>
-
-# Buildd Slave tool to apply the ogre model to the chroot
-
-# Expects build id as arg 1, makes build-id to contain the build
-# Expects ogre component name as arg 2
-
-# Needs SUDO to be set to a sudo instance for passwordless access
-# LN must be an ln instance which can take -s and -f at the same time
-
-SUDO=/usr/bin/sudo
-
-BUILDID="$1"
-COMPONENT="$2"
-
-set -e
-
-exec 2>&1
-
-cd $HOME
-cd "build-$BUILDID/chroot-autobuild/etc/apt"
-
-echo "Attempting OGRE for $COMPONENT in build-$BUILDID"
-
-if [ -e "sources.list.$COMPONENT" ]; then
-  if [ -h "sources.list" ]; then
-    $SUDO ln -sf "sources.list.$COMPONENT" sources.list
-  else
-    echo "OGRE sources.list found, but sources.list is not a symlink"
-  fi
-else
-  echo "No OGRE sources.list found."
-fi
-

=== modified file 'lib/canonical/buildd/binarypackage.py'
--- lib/canonical/buildd/binarypackage.py	2010-01-14 02:55:22 +0000
+++ lib/canonical/buildd/binarypackage.py	2010-06-12 05:15:45 +0000
@@ -55,22 +55,12 @@
                 self._dscfile = f
         if self._dscfile is None:
             raise ValueError, files
-        if 'arch_indep' in extra_args:
-            self.arch_indep = extra_args['arch_indep']
-        else:
-            self.arch_indep = False
-        if 'suite' in extra_args:
-            self.suite = extra_args['suite']
-        else:
-            self.suite = False
-        if 'archive_purpose' in extra_args:
-            self.archive_purpose = extra_args['archive_purpose']
-        else:
-            self.archive_purpose = False
-        if 'build_debug_symbols' in extra_args:
-            self.build_debug_symbols = extra_args['build_debug_symbols']
-        else:
-            self.build_debug_symbols = False
+
+        self.archive_purpose = extra_args.get('archive_purpose')
+        self.suite = extra_args.get('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)
 
         super(BinaryPackageBuildManager, self).initiate(
             files, chroot, extra_args)
@@ -92,7 +82,7 @@
             args.extend(["--purpose=" + self.archive_purpose])
         if self.build_debug_symbols:
             args.extend(["--build-debug-symbols"])
-        args.extend(["--comp=" + self.ogre])
+        args.extend(["--comp=" + self.component])
         args.extend([self._dscfile])
         self.runSubProcess( self._sbuildpath, args )
 

=== modified file 'lib/canonical/buildd/debian.py'
--- lib/canonical/buildd/debian.py	2010-01-14 20:19:27 +0000
+++ lib/canonical/buildd/debian.py	2010-06-12 05:15:45 +0000
@@ -20,7 +20,6 @@
     INIT = "INIT"
     UNPACK = "UNPACK"
     MOUNT = "MOUNT"
-    OGRE = "OGRE"
     SOURCES = "SOURCES"
     UPDATE = "UPDATE"
     REAP = "REAP"
@@ -35,7 +34,6 @@
         BuildManager.__init__(self, slave, buildid)
         self._updatepath = slave._config.get("debianmanager", "updatepath")
         self._scanpath = slave._config.get("debianmanager", "processscanpath")
-        self._ogrepath = slave._config.get("debianmanager", "ogrepath")
         self._sourcespath = slave._config.get("debianmanager", "sourcespath")
         self._cachepath = slave._config.get("slave","filecache")
         self._state = DebianBuildState.INIT
@@ -49,32 +47,15 @@
     def initiate(self, files, chroot, extra_args):
         """Initiate a build with a given set of files and chroot."""
 
-        if 'ogrecomponent' in extra_args:
-            # Ubuntu refers to the concept that "main sees only main
-            # while building" etc as "The Ogre Model" (onions, layers
-            # and all). If we're given an ogre component, use it
-            self.ogre = extra_args['ogrecomponent']
-        else:
-            self.ogre = False
-        if 'archives' in extra_args and extra_args['archives']:
-            self.sources_list = extra_args['archives']
-        else:
-            self.sources_list = None
+        self.sources_list = extra_args.get('archives')
 
         BuildManager.initiate(self, files, chroot, extra_args)
 
-    def doOgreModel(self):
-        """Perform the ogre model activation."""
-        self.runSubProcess(self._ogrepath,
-                           ["apply-ogre-model", self._buildid, self.ogre])
-
     def doSourcesList(self):
         """Override apt/sources.list.
 
         Mainly used for PPA builds.
         """
-        # XXX cprov 2007-05-17: It 'undo' ogre-component changes.
-        # for PPAs it must be re-implemented on builddmaster side.
         args = ["override-sources-list", self._buildid]
         args.extend(self.sources_list)
         self.runSubProcess(self._sourcespath, args)
@@ -181,26 +162,6 @@
             self._state = DebianBuildState.UMOUNT
             self.doUnmounting()
         else:
-            # Run OGRE if we need to, else run UPDATE
-            if self.ogre:
-                self._state = DebianBuildState.OGRE
-                self.doOgreModel()
-            elif self.sources_list is not None:
-                self._state = DebianBuildState.SOURCES
-                self.doSourcesList()
-            else:
-                self._state = DebianBuildState.UPDATE
-                self.doUpdateChroot()
-
-    def iterate_OGRE(self, success):
-        """Just finished running the ogre applicator."""
-        if success != 0:
-            if not self.alreadyfailed:
-                self._slave.chrootFail()
-                self.alreadyfailed = True
-            self._state = DebianBuildState.REAP
-            self.doReapProcesses()
-        else:
             if self.sources_list is not None:
                 self._state = DebianBuildState.SOURCES
                 self.doSourcesList()

=== modified file 'lib/canonical/buildd/debian/changelog'
--- lib/canonical/buildd/debian/changelog	2010-06-10 16:52:04 +0000
+++ lib/canonical/buildd/debian/changelog	2010-06-12 05:15:45 +0000
@@ -1,3 +1,10 @@
+launchpad-buildd (63) hardy-cat; urgency=low
+
+  * Drop apply-ogre-model, since override-sources-list replaced it three years
+    ago. Also clean up extra_args parsing a bit.
+
+ -- William Grant <[e-mail]>  Sat, 12 Jun 2010 11:33:11 +1000
+
 launchpad-buildd (62) hardy-cat; urgency=low
 
   * Make the buildds cope with not having a sourcepackagename LP#587109 

=== modified file 'lib/canonical/buildd/debian/rules'
--- lib/canonical/buildd/debian/rules	2010-03-10 21:23:17 +0000
+++ lib/canonical/buildd/debian/rules	2010-06-12 05:15:45 +0000
@@ -24,8 +24,8 @@
 pyfiles = debian.py slave.py binarypackage.py utils.py __init__.py \
     sourcepackagerecipe.py translationtemplates.py
 slavebins = unpack-chroot mount-chroot update-debian-chroot sbuild-package \
-scan-for-processes umount-chroot remove-build apply-ogre-model \
-override-sources-list buildrecipe generate-translation-templates
+    scan-for-processes umount-chroot remove-build override-sources-list \
+    buildrecipe generate-translation-templates
 
 BUILDDUID=65500
 BUILDDGID=65500

=== modified file 'lib/canonical/buildd/debian/upgrade-config'
--- lib/canonical/buildd/debian/upgrade-config	2010-04-01 03:47:51 +0000
+++ lib/canonical/buildd/debian/upgrade-config	2010-06-12 05:15:45 +0000
@@ -92,6 +92,15 @@
         'generatepath = /usr/share/launchpad-buildd/slavebin/generate-translation-templates\n'
         'resultarchive = translation-templates.tar.gz\n')
 
+def upgrade_to_63():
+    print "Upgrading %s to version 63" % conf_file
+    subprocess.call(["mv", conf_file, conf_file+"-prev63~"])
+    in_file = open(conf_file+"-prev63~", "r")
+    out_file = open(conf_file, "w")
+    for line in in_file:
+        if not line.startswith('ogrepath'):
+            out_file.write(line)
+
 
 if __name__ == "__main__":
     if old_version.find("~") > 0:
@@ -108,4 +117,6 @@
         upgrade_to_58()
     if int(old_version) < 59:
         upgrade_to_59()
+    if int(old_version) < 63:
+        upgrade_to_63()
 

=== modified file 'lib/canonical/buildd/template-buildd-slave.conf'
--- lib/canonical/buildd/template-buildd-slave.conf	2010-03-12 08:32:39 +0000
+++ lib/canonical/buildd/template-buildd-slave.conf	2010-06-12 05:15:45 +0000
@@ -18,7 +18,6 @@
 [debianmanager]
 updatepath = /usr/share/launchpad-buildd/slavebin/update-debian-chroot
 processscanpath = /usr/share/launchpad-buildd/slavebin/scan-for-processes
-ogrepath = /usr/share/launchpad-buildd/slavebin/apply-ogre-model
 sourcespath = /usr/share/launchpad-buildd/slavebin/override-sources-list
 
 [binarypackagemanager]

=== modified file 'lib/canonical/buildd/tests/buildd-slave-test.conf'
--- lib/canonical/buildd/tests/buildd-slave-test.conf	2007-06-05 00:53:06 +0000
+++ lib/canonical/buildd/tests/buildd-slave-test.conf	2010-06-12 05:15:45 +0000
@@ -17,5 +17,4 @@
 sbuildargs = -dautobuild --nolog --batch
 updatepath = /var/tmp/buildd/slavebin/update-debian-chroot
 processscanpath = /var/tmp/buildd/slavebin/scan-for-processes
-ogrepath = /var/tmp/buildd/slavebin/apply-ogre-model
 sourcespath = /usr/share/launchpad-buildd/slavebin/override-sources-list