launchpad-buildd

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

  1. Git
  2. lp:~cjwatson/launchpad-buildd
  3. rename-slave-config-env
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: ebdfd6e01709add290c4bcb87640d5fa3c148ce2
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad-buildd:rename-slave-config-env
Merge into: launchpad-buildd:master
Diff against target: 57 lines (+7/-4)
4 files modified
debian/changelog (+4/-0)
debian/launchpad-buildd.init (+1/-1)
lpbuildd/buildd-slave.tac (+1/-1)
lpbuildd/tests/harness.py (+1/-2)
Reviewer Review Type Date Requested Status
Jürgen Gmach Approve
Review via email: mp+411220@code.launchpad.net

Commit message

Rename BUILDD_SLAVE_CONFIG environment variable to BUILDD_CONFIG

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/debian/changelog b/debian/changelog
2index a374fcd..4c02af4 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,8 +1,12 @@
6 launchpad-buildd (208) UNRELEASED; urgency=medium
7
8+ [ Jürgen Gmach ]
9 * Adjust updated command line option for the CI runner.
10 * Publish documentation on Read the Docs.
11
12+ [ Colin Watson ]
13+ * Rename BUILDD_SLAVE_CONFIG environment variable to BUILDD_CONFIG.
14+
15 -- Jürgen Gmach <juergen.gmach@canonical.com> Mon, 07 Feb 2022 18:20:58 +0000
16
17 launchpad-buildd (207) bionic; urgency=medium
18diff --git a/debian/launchpad-buildd.init b/debian/launchpad-buildd.init
19index 4952893..b92d911 100755
20--- a/debian/launchpad-buildd.init
21+++ b/debian/launchpad-buildd.init
22@@ -79,7 +79,7 @@ d_start() {
23 # Useful for certain kinds of image builds.
24 modprobe nbd || true
25
26- su - buildd -c "BUILDD_SLAVE_CONFIG=$CONFROOT/$CONF twistd3 --no_save --pidfile $PIDFILE --python $TACFILE --logfile $LOGFILE --umask 022"
27+ su - buildd -c "BUILDD_CONFIG=$CONFROOT/$CONF twistd3 --no_save --pidfile $PIDFILE --python $TACFILE --logfile $LOGFILE --umask 022"
28 }
29
30 #
31diff --git a/lpbuildd/buildd-slave.tac b/lpbuildd/buildd-slave.tac
32index 24d60ef..7c3bd58 100644
33--- a/lpbuildd/buildd-slave.tac
34+++ b/lpbuildd/buildd-slave.tac
35@@ -36,7 +36,7 @@ from lpbuildd.translationtemplates import TranslationTemplatesBuildManager
36 options = ServerOptions()
37 options.parseOptions()
38
39-conffile = os.environ.get('BUILDD_SLAVE_CONFIG', 'buildd-slave-example.conf')
40+conffile = os.environ.get('BUILDD_CONFIG', 'buildd-slave-example.conf')
41
42 conf = SafeConfigParser()
43 conf.read(conffile)
44diff --git a/lpbuildd/tests/harness.py b/lpbuildd/tests/harness.py
45index bd85753..f064d53 100644
46--- a/lpbuildd/tests/harness.py
47+++ b/lpbuildd/tests/harness.py
48@@ -114,8 +114,7 @@ class BuilddTestSetup(TacTestFixture):
49 filecache = os.path.join(self.root, 'filecache')
50 os.mkdir(filecache)
51 self.useFixture(EnvironmentVariable('HOME', self.root))
52- self.useFixture(
53- EnvironmentVariable('BUILDD_SLAVE_CONFIG', test_conffile))
54+ self.useFixture(EnvironmentVariable('BUILDD_CONFIG', test_conffile))
55 # XXX cprov 2005-05-30:
56 # When we are about running it seriously we need :
57 # * install sbuild package

Subscribers

People subscribed via source and target branches