Merge lp:~cjwatson/launchpad-buildd/rename-slave-prep into lp:launchpad-buildd

[Colin Watson]

Rename slave-prep to builder-prep.

Let's start moving towards terminology that doesn't make me cringe every time I read it.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2017-11-24 12:26:45 +0000
+++ MANIFEST.in	2019-02-08 15:59:57 +0000
@@ -1,9 +1,9 @@
 include LICENSE
 include Makefile
+include bin/builder-prep
 include bin/buildrecipe
 include bin/in-target
 include bin/sbuild-package
-include bin/slave-prep
 include bin/snap-git-proxy
 include bin/test_buildd_generatetranslationtemplates
 include bin/test_buildd_recipe

=== renamed file 'bin/slave-prep' => 'bin/builder-prep'
--- bin/slave-prep	2017-07-26 12:01:39 +0000
+++ bin/builder-prep	2019-02-08 15:59:57 +0000
@@ -3,7 +3,7 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-# Buildd Slave initial preparation script
+# Buildd initial preparation script
 
 export PATH=/usr/bin:/bin:/usr/sbin:/sbin:${PATH}
 
@@ -12,7 +12,6 @@
 PACKAGES="launchpad-buildd python-lpbuildd sbuild bzr-builder bzr git-build-recipe git dpkg-dev python-debian"
 KERNEL=$(uname -snrvm)
 
-echo "Forking launchpad-buildd slave process..."
 echo "Kernel version: $KERNEL"
 echo -n "Buildd toolchain package versions:"
 for package in $PACKAGES; do

=== modified file 'debian/changelog'
--- debian/changelog	2019-02-08 15:21:16 +0000
+++ debian/changelog	2019-02-08 15:59:57 +0000
@@ -1,6 +1,7 @@
 launchpad-buildd (168) UNRELEASED; urgency=medium
 
   * Remove obsolete chroot-building instructions from README.
+  * Rename slave-prep to builder-prep.
 
  -- Colin Watson <[e-mail]>  Fri, 08 Feb 2019 15:09:35 +0000
 

=== modified file 'debian/launchpad-buildd.install'
--- debian/launchpad-buildd.install	2017-09-08 16:01:37 +0000
+++ debian/launchpad-buildd.install	2019-02-08 15:59:57 +0000
@@ -1,7 +1,7 @@
+bin/builder-prep			usr/share/launchpad-buildd/slavebin
 bin/buildrecipe				usr/share/launchpad-buildd/slavebin
 bin/in-target				usr/share/launchpad-buildd/slavebin
 bin/sbuild-package			usr/share/launchpad-buildd/slavebin
-bin/slave-prep				usr/share/launchpad-buildd/slavebin
 bin/snap-git-proxy			usr/share/launchpad-buildd/slavebin
 buildd-genconfig			usr/share/launchpad-buildd
 debian/upgrade-config			usr/share/launchpad-buildd

=== modified file 'lpbuildd/slave.py'
--- lpbuildd/slave.py	2019-01-10 18:14:55 +0000
+++ lpbuildd/slave.py	2019-02-08 15:59:57 +0000
@@ -139,7 +139,7 @@
         self._reactor = reactor
         self._sharepath = slave._config.get("slave", "sharepath")
         self._slavebin = os.path.join(self._sharepath, "slavebin")
-        self._preppath = os.path.join(self._slavebin, "slave-prep")
+        self._preppath = os.path.join(self._slavebin, "builder-prep")
         self._intargetpath = os.path.join(self._slavebin, "in-target")
         self._subprocess = None
         self._reaped_states = set()
@@ -260,7 +260,7 @@
             self.backend_name, self._buildid,
             series=self.series, arch=self.arch_tag)
 
-        self.runSubProcess(self._preppath, ["slave-prep"])
+        self.runSubProcess(self._preppath, ["builder-prep"])
 
     def status(self):
         """Return extra status for this build manager, as a dictionary.

=== modified file 'lpbuildd/tests/test_debian.py'
--- lpbuildd/tests/test_debian.py	2019-01-10 18:14:55 +0000
+++ lpbuildd/tests/test_debian.py	2019-02-08 15:59:57 +0000
@@ -86,7 +86,7 @@
         self.buildmanager.initiate({}, 'chroot.tar.gz', extra_args)
         self.assertEqual(DebianBuildState.INIT, self.getState())
         self.assertEqual(
-            (['sharepath/slavebin/slave-prep', 'slave-prep'], None),
+            (['sharepath/slavebin/builder-prep', 'builder-prep'], None),
             self.buildmanager.commands[-1])
         self.assertEqual(
             self.buildmanager.iterate, self.buildmanager.iterators[-1])