launchpad-reviewers team mailing list archive

[Colin Watson <mp+420011@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad-buildd:rename-config-files into launchpad-buildd:master.

Commit message:
Remove unnecessary "slave" component from some file names

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad-buildd/+git/launchpad-buildd/+merge/420011
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad-buildd:rename-config-files into launchpad-buildd:master.

diff --git a/.gitignore b/.gitignore
index 37400f5..42f1548 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 *.egg-info
 *.pyc
 .pybuild
-buildd-slave-example.conf
+buildd-example.conf
 charm/*.charm
 dist
 debian/debhelper-build-stamp
diff --git a/MANIFEST.in b/MANIFEST.in
index c1783cc..666f026 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -10,6 +10,6 @@ include bin/test_buildd_recipe
 include buildd-genconfig
 include debian/changelog
 include sbuildrc
-include template-buildd-slave.conf
-include lpbuildd/buildd-slave.tac
+include template-buildd.conf
+include lpbuildd/buildd.tac
 recursive-include lpbuildd/tests *.diff *.tar.gz buildlog buildlog.long
diff --git a/buildd-genconfig b/buildd-genconfig
index be633ed..0ad028d 100755
--- a/buildd-genconfig
+++ b/buildd-genconfig
@@ -37,7 +37,7 @@ parser.add_option(
     "-t", "--template", dest="TEMPLATE",
     help="the template file to use",
     metavar="FILE",
-    default="/usr/share/launchpad-buildd/template-buildd-slave.conf")
+    default="/usr/share/launchpad-buildd/template-buildd.conf")
 
 parser.add_option(
     "--proxy-port", dest="PROXYPORT",
diff --git a/debian/changelog b/debian/changelog
index ad5eace..e213691 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 launchpad-buildd (213) UNRELEASED; urgency=medium
 
   * Dynamically generate configuration file in lpbuildd.tests.harness.
+  * Remove unnecessary "slave" component from some file names.
 
  -- Colin Watson <cjwatson@xxxxxxxxxx>  Wed, 20 Apr 2022 16:03:01 +0100
 
diff --git a/debian/clean b/debian/clean
index 5d3c7d2..5792b40 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1 +1 @@
-buildd-slave-example.conf
+buildd-example.conf
diff --git a/debian/launchpad-buildd.examples b/debian/launchpad-buildd.examples
index 5d3c7d2..5792b40 100644
--- a/debian/launchpad-buildd.examples
+++ b/debian/launchpad-buildd.examples
@@ -1 +1 @@
-buildd-slave-example.conf
+buildd-example.conf
diff --git a/debian/launchpad-buildd.install b/debian/launchpad-buildd.install
index 208bfde..301561a 100644
--- a/debian/launchpad-buildd.install
+++ b/debian/launchpad-buildd.install
@@ -9,4 +9,4 @@ debian/launchpad-buildd-generator	lib/systemd/system-generators
 debian/upgrade-config			usr/share/launchpad-buildd
 default/launchpad-buildd 		etc/default
 sbuildrc				usr/share/launchpad-buildd
-template-buildd-slave.conf		usr/share/launchpad-buildd
+template-buildd.conf			usr/share/launchpad-buildd
diff --git a/debian/launchpad-buildd.links b/debian/launchpad-buildd.links
index 4596e71..9da9c20 100755
--- a/debian/launchpad-buildd.links
+++ b/debian/launchpad-buildd.links
@@ -1,2 +1,2 @@
 #! /usr/bin/dh-exec
-${LIBDIR}/lpbuildd/buildd-slave.tac	usr/lib/launchpad-buildd/buildd-slave.tac
+${LIBDIR}/lpbuildd/buildd.tac	usr/lib/launchpad-buildd/buildd.tac
diff --git a/debian/launchpad-buildd@.service b/debian/launchpad-buildd@.service
index 8ebaa58..9d4b4b2 100644
--- a/debian/launchpad-buildd@.service
+++ b/debian/launchpad-buildd@.service
@@ -25,7 +25,7 @@ Environment=BUILDD_CONFIG=/etc/launchpad-buildd/%i
 # machines, edit /etc/default/launchpad-buildd.
 ExecStartPre=/usr/bin/test ${RUN_NETWORK_REQUESTS_AS_ROOT} = yes
 ExecStartPre=/usr/bin/install -d /home/buildd/filecache-default
-ExecStart=/usr/bin/twistd3 --no_save --pidfile /run/launchpad-buildd/%i.pid --python /usr/lib/launchpad-buildd/buildd-slave.tac --logfile /var/log/launchpad-buildd/%i.log --umask 022 --nodaemon
+ExecStart=/usr/bin/twistd3 --no_save --pidfile /run/launchpad-buildd/%i.pid --python /usr/lib/launchpad-buildd/buildd.tac --logfile /var/log/launchpad-buildd/%i.log --umask 022 --nodaemon
 
 [Install]
 WantedBy=multi-user.target
diff --git a/debian/rules b/debian/rules
index be006d8..644e7f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,9 +13,9 @@ export LIBDIR := $(shell python3 -c 'import distutils.sysconfig; print(distutils
 
 override_dh_auto_build:
 	dh_auto_build
-	python3 buildd-genconfig --template=template-buildd-slave.conf \
+	python3 buildd-genconfig --template=template-buildd.conf \
 	--arch=i386 --port=8221 --name=default --host=buildd.buildd \
-		> buildd-slave-example.conf
+		> buildd-example.conf
 
 # Required in debhelper compatibility level <=10 to avoid generating
 # postinst fragments to register a nonexistent init.d script.
diff --git a/lpbuildd/buildd-slave.tac b/lpbuildd/buildd.tac
similarity index 98%
rename from lpbuildd/buildd-slave.tac
rename to lpbuildd/buildd.tac
index 7c3bd58..d73f300 100644
--- a/lpbuildd/buildd-slave.tac
+++ b/lpbuildd/buildd.tac
@@ -36,7 +36,7 @@ from lpbuildd.translationtemplates import TranslationTemplatesBuildManager
 options = ServerOptions()
 options.parseOptions()
 
-conffile = os.environ.get('BUILDD_CONFIG', 'buildd-slave-example.conf')
+conffile = os.environ.get('BUILDD_CONFIG', 'buildd-example.conf')
 
 conf = SafeConfigParser()
 conf.read(conffile)
diff --git a/lpbuildd/tests/harness.py b/lpbuildd/tests/harness.py
index 103308b..aeda8e2 100644
--- a/lpbuildd/tests/harness.py
+++ b/lpbuildd/tests/harness.py
@@ -148,16 +148,16 @@ class BuilddTestSetup(TacTestFixture):
         return os.path.abspath(os.path.join(
             os.path.dirname(__file__),
             os.path.pardir,
-            'buildd-slave.tac'
+            'buildd.tac'
             ))
 
     @property
     def pidfile(self):
-        return os.path.join(self.root, 'build-slave.pid')
+        return os.path.join(self.root, 'buildd.pid')
 
     @property
     def logfile(self):
-        return '/var/tmp/build-slave.log'
+        return '/var/tmp/buildd.log'
 
     @property
     def daemon_port(self):
diff --git a/template-buildd-slave.conf b/template-buildd.conf
similarity index 100%
rename from template-buildd-slave.conf
rename to template-buildd.conf