launchpad-buildd

Merge ~cjwatson/launchpad-buildd:rename-config-files into launchpad-buildd:master

  1. Git
  2. lp:~cjwatson/launchpad-buildd
  3. rename-config-files
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 0edcd276268303933b8b94f6b5a877fabaa7834c
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad-buildd:rename-config-files
Merge into: launchpad-buildd:master
Diff against target: 156 lines (+16/-15)
12 files modified
.gitignore (+1/-1)
MANIFEST.in (+2/-2)
buildd-genconfig (+1/-1)
debian/changelog (+1/-0)
debian/clean (+1/-1)
debian/launchpad-buildd.examples (+1/-1)
debian/launchpad-buildd.install (+1/-1)
debian/launchpad-buildd.links (+1/-1)
debian/launchpad-buildd@.service (+1/-1)
debian/rules (+2/-2)
lpbuildd/buildd.tac (+1/-1)
lpbuildd/tests/harness.py (+3/-3)
Reviewer Review Type Date Requested Status
Jürgen Gmach Approve
Review via email: mp+420011@code.launchpad.net

Commit message

Remove unnecessary "slave" component from some file names

To post a comment you must log in.
Revision history for this message
Jürgen Gmach (jugmac00) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/.gitignore b/.gitignore
2index 37400f5..42f1548 100644
3--- a/.gitignore
4+++ b/.gitignore
5@@ -1,7 +1,7 @@
6 *.egg-info
7 *.pyc
8 .pybuild
9-buildd-slave-example.conf
10+buildd-example.conf
11 charm/*.charm
12 dist
13 debian/debhelper-build-stamp
14diff --git a/MANIFEST.in b/MANIFEST.in
15index c1783cc..666f026 100644
16--- a/MANIFEST.in
17+++ b/MANIFEST.in
18@@ -10,6 +10,6 @@ include bin/test_buildd_recipe
19 include buildd-genconfig
20 include debian/changelog
21 include sbuildrc
22-include template-buildd-slave.conf
23-include lpbuildd/buildd-slave.tac
24+include template-buildd.conf
25+include lpbuildd/buildd.tac
26 recursive-include lpbuildd/tests *.diff *.tar.gz buildlog buildlog.long
27diff --git a/buildd-genconfig b/buildd-genconfig
28index be633ed..0ad028d 100755
29--- a/buildd-genconfig
30+++ b/buildd-genconfig
31@@ -37,7 +37,7 @@ parser.add_option(
32 "-t", "--template", dest="TEMPLATE",
33 help="the template file to use",
34 metavar="FILE",
35- default="/usr/share/launchpad-buildd/template-buildd-slave.conf")
36+ default="/usr/share/launchpad-buildd/template-buildd.conf")
37
38 parser.add_option(
39 "--proxy-port", dest="PROXYPORT",
40diff --git a/debian/changelog b/debian/changelog
41index ad5eace..e213691 100644
42--- a/debian/changelog
43+++ b/debian/changelog
44@@ -1,6 +1,7 @@
45 launchpad-buildd (213) UNRELEASED; urgency=medium
46
47 * Dynamically generate configuration file in lpbuildd.tests.harness.
48+ * Remove unnecessary "slave" component from some file names.
49
50 -- Colin Watson <cjwatson@ubuntu.com> Wed, 20 Apr 2022 16:03:01 +0100
51
52diff --git a/debian/clean b/debian/clean
53index 5d3c7d2..5792b40 100644
54--- a/debian/clean
55+++ b/debian/clean
56@@ -1 +1 @@
57-buildd-slave-example.conf
58+buildd-example.conf
59diff --git a/debian/launchpad-buildd.examples b/debian/launchpad-buildd.examples
60index 5d3c7d2..5792b40 100644
61--- a/debian/launchpad-buildd.examples
62+++ b/debian/launchpad-buildd.examples
63@@ -1 +1 @@
64-buildd-slave-example.conf
65+buildd-example.conf
66diff --git a/debian/launchpad-buildd.install b/debian/launchpad-buildd.install
67index 208bfde..301561a 100644
68--- a/debian/launchpad-buildd.install
69+++ b/debian/launchpad-buildd.install
70@@ -9,4 +9,4 @@ debian/launchpad-buildd-generator lib/systemd/system-generators
71 debian/upgrade-config usr/share/launchpad-buildd
72 default/launchpad-buildd etc/default
73 sbuildrc usr/share/launchpad-buildd
74-template-buildd-slave.conf usr/share/launchpad-buildd
75+template-buildd.conf usr/share/launchpad-buildd
76diff --git a/debian/launchpad-buildd.links b/debian/launchpad-buildd.links
77index 4596e71..9da9c20 100755
78--- a/debian/launchpad-buildd.links
79+++ b/debian/launchpad-buildd.links
80@@ -1,2 +1,2 @@
81 #! /usr/bin/dh-exec
82-${LIBDIR}/lpbuildd/buildd-slave.tac usr/lib/launchpad-buildd/buildd-slave.tac
83+${LIBDIR}/lpbuildd/buildd.tac usr/lib/launchpad-buildd/buildd.tac
84diff --git a/debian/launchpad-buildd@.service b/debian/launchpad-buildd@.service
85index 8ebaa58..9d4b4b2 100644
86--- a/debian/launchpad-buildd@.service
87+++ b/debian/launchpad-buildd@.service
88@@ -25,7 +25,7 @@ Environment=BUILDD_CONFIG=/etc/launchpad-buildd/%i
89 # machines, edit /etc/default/launchpad-buildd.
90 ExecStartPre=/usr/bin/test ${RUN_NETWORK_REQUESTS_AS_ROOT} = yes
91 ExecStartPre=/usr/bin/install -d /home/buildd/filecache-default
92-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
93+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
94
95 [Install]
96 WantedBy=multi-user.target
97diff --git a/debian/rules b/debian/rules
98index be006d8..644e7f9 100755
99--- a/debian/rules
100+++ b/debian/rules
101@@ -13,9 +13,9 @@ export LIBDIR := $(shell python3 -c 'import distutils.sysconfig; print(distutils
102
103 override_dh_auto_build:
104 dh_auto_build
105- python3 buildd-genconfig --template=template-buildd-slave.conf \
106+ python3 buildd-genconfig --template=template-buildd.conf \
107 --arch=i386 --port=8221 --name=default --host=buildd.buildd \
108- > buildd-slave-example.conf
109+ > buildd-example.conf
110
111 # Required in debhelper compatibility level <=10 to avoid generating
112 # postinst fragments to register a nonexistent init.d script.
113diff --git a/lpbuildd/buildd-slave.tac b/lpbuildd/buildd.tac
114similarity index 98%
115rename from lpbuildd/buildd-slave.tac
116rename to lpbuildd/buildd.tac
117index 7c3bd58..d73f300 100644
118--- a/lpbuildd/buildd-slave.tac
119+++ b/lpbuildd/buildd.tac
120@@ -36,7 +36,7 @@ from lpbuildd.translationtemplates import TranslationTemplatesBuildManager
121 options = ServerOptions()
122 options.parseOptions()
123
124-conffile = os.environ.get('BUILDD_CONFIG', 'buildd-slave-example.conf')
125+conffile = os.environ.get('BUILDD_CONFIG', 'buildd-example.conf')
126
127 conf = SafeConfigParser()
128 conf.read(conffile)
129diff --git a/lpbuildd/tests/harness.py b/lpbuildd/tests/harness.py
130index 103308b..aeda8e2 100644
131--- a/lpbuildd/tests/harness.py
132+++ b/lpbuildd/tests/harness.py
133@@ -148,16 +148,16 @@ class BuilddTestSetup(TacTestFixture):
134 return os.path.abspath(os.path.join(
135 os.path.dirname(__file__),
136 os.path.pardir,
137- 'buildd-slave.tac'
138+ 'buildd.tac'
139 ))
140
141 @property
142 def pidfile(self):
143- return os.path.join(self.root, 'build-slave.pid')
144+ return os.path.join(self.root, 'buildd.pid')
145
146 @property
147 def logfile(self):
148- return '/var/tmp/build-slave.log'
149+ return '/var/tmp/buildd.log'
150
151 @property
152 def daemon_port(self):
153diff --git a/template-buildd-slave.conf b/template-buildd.conf
154similarity index 100%
155rename from template-buildd-slave.conf
156rename to template-buildd.conf

Subscribers

People subscribed via source and target branches