launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #23313
[Merge] lp:~cjwatson/launchpad-buildd/rename-slavebin into lp:launchpad-buildd
Colin Watson has proposed merging lp:~cjwatson/launchpad-buildd/rename-slavebin into lp:launchpad-buildd.
Commit message:
Move /usr/share/launchpad-buildd/slavebin to /usr/share/launchpad-buildd/bin.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~cjwatson/launchpad-buildd/rename-slavebin/+merge/362974
--
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad-buildd/rename-slavebin into lp:launchpad-buildd.
=== modified file 'bin/sbuild-package'
--- bin/sbuild-package 2017-08-03 13:13:08 +0000
+++ bin/sbuild-package 2019-02-11 12:23:51 +0000
@@ -82,5 +82,5 @@
;;
esac
-$SBUILD "$@" | /usr/share/launchpad-buildd/slavebin/check-implicit-pointer-functions --inline $WARN
+$SBUILD "$@" | /usr/share/launchpad-buildd/bin/check-implicit-pointer-functions --inline $WARN
exit $?
=== modified file 'debian/changelog'
--- debian/changelog 2019-02-11 11:57:56 +0000
+++ debian/changelog 2019-02-11 12:23:51 +0000
@@ -4,6 +4,8 @@
* Rename slave-prep to builder-prep.
* Generalise snap channel handling slightly, allowing channel selection
for core16 and core18.
+ * Move /usr/share/launchpad-buildd/slavebin to
+ /usr/share/launchpad-buildd/bin.
-- Colin Watson <cjwatson@xxxxxxxxxx> Fri, 08 Feb 2019 15:09:35 +0000
=== modified file 'debian/launchpad-buildd.install'
--- debian/launchpad-buildd.install 2019-02-08 15:54:20 +0000
+++ debian/launchpad-buildd.install 2019-02-11 12:23:51 +0000
@@ -1,8 +1,8 @@
-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/snap-git-proxy usr/share/launchpad-buildd/slavebin
+bin/builder-prep usr/share/launchpad-buildd/bin
+bin/buildrecipe usr/share/launchpad-buildd/bin
+bin/in-target usr/share/launchpad-buildd/bin
+bin/sbuild-package usr/share/launchpad-buildd/bin
+bin/snap-git-proxy usr/share/launchpad-buildd/bin
buildd-genconfig usr/share/launchpad-buildd
debian/upgrade-config usr/share/launchpad-buildd
default/launchpad-buildd etc/default
=== modified file 'debian/launchpad-buildd.links'
--- debian/launchpad-buildd.links 2017-11-24 13:31:54 +0000
+++ debian/launchpad-buildd.links 2019-02-11 12:23:51 +0000
@@ -1,2 +1,2 @@
#! /usr/bin/dh-exec
-${LIBDIR}/lpbuildd/check_implicit_pointer_functions.py usr/share/launchpad-buildd/slavebin/check-implicit-pointer-functions
+${LIBDIR}/lpbuildd/check_implicit_pointer_functions.py usr/share/launchpad-buildd/bin/check-implicit-pointer-functions
=== modified file 'lpbuildd/binarypackage.py'
--- lpbuildd/binarypackage.py 2018-10-19 06:41:14 +0000
+++ lpbuildd/binarypackage.py 2019-02-11 12:23:51 +0000
@@ -94,7 +94,7 @@
def __init__(self, slave, buildid, **kwargs):
DebianBuildManager.__init__(self, slave, buildid, **kwargs)
- self._sbuildpath = os.path.join(self._slavebin, "sbuild-package")
+ self._sbuildpath = os.path.join(self._bin, "sbuild-package")
@property
def chroot_path(self):
=== modified file 'lpbuildd/slave.py'
--- lpbuildd/slave.py 2019-02-08 15:54:20 +0000
+++ lpbuildd/slave.py 2019-02-11 12:23:51 +0000
@@ -138,9 +138,9 @@
reactor = default_reactor
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, "builder-prep")
- self._intargetpath = os.path.join(self._slavebin, "in-target")
+ self._bin = os.path.join(self._sharepath, "bin")
+ self._preppath = os.path.join(self._bin, "builder-prep")
+ self._intargetpath = os.path.join(self._bin, "in-target")
self._subprocess = None
self._reaped_states = set()
self.is_archive_private = False
=== modified file 'lpbuildd/sourcepackagerecipe.py'
--- lpbuildd/sourcepackagerecipe.py 2018-10-19 06:41:14 +0000
+++ lpbuildd/sourcepackagerecipe.py 2019-02-11 12:23:51 +0000
@@ -62,7 +62,7 @@
:param buildid: The id of the build (a str).
"""
DebianBuildManager.__init__(self, slave, buildid)
- self.build_recipe_path = os.path.join(self._slavebin, "buildrecipe")
+ self.build_recipe_path = os.path.join(self._bin, "buildrecipe")
def initiate(self, files, chroot, extra_args):
"""Initiate a build with a given set of files and chroot.
=== modified file 'lpbuildd/target/build_snap.py'
--- lpbuildd/target/build_snap.py 2019-02-07 11:52:09 +0000
+++ lpbuildd/target/build_snap.py 2019-02-11 12:23:51 +0000
@@ -77,7 +77,7 @@
def __init__(self, args, parser):
super(BuildSnap, self).__init__(args, parser)
- self.slavebin = os.path.dirname(sys.argv[0])
+ self.bin = os.path.dirname(sys.argv[0])
def run_build_command(self, args, env=None, **kwargs):
"""Run a build command in the target.
@@ -158,7 +158,7 @@
"snapcraft"])
if self.args.proxy_url:
self.backend.copy_in(
- os.path.join(self.slavebin, "snap-git-proxy"),
+ os.path.join(self.bin, "snap-git-proxy"),
"/usr/local/bin/snap-git-proxy")
self.install_svn_servers()
=== modified file 'lpbuildd/target/tests/test_build_snap.py'
--- lpbuildd/target/tests/test_build_snap.py 2019-02-07 11:52:09 +0000
+++ lpbuildd/target/tests/test_build_snap.py 2019-02-11 12:23:51 +0000
@@ -141,10 +141,10 @@
"test-snap",
]
build_snap = parse_args(args=args).operation
- build_snap.slavebin = "/slavebin"
- self.useFixture(FakeFilesystem()).add("/slavebin")
- os.mkdir("/slavebin")
- with open("/slavebin/snap-git-proxy", "w") as proxy_script:
+ build_snap.bin = "/builderbin"
+ self.useFixture(FakeFilesystem()).add("/builderbin")
+ os.mkdir("/builderbin")
+ with open("/builderbin/snap-git-proxy", "w") as proxy_script:
proxy_script.write("proxy script\n")
os.fchmod(proxy_script.fileno(), 0o755)
build_snap.install()
=== modified file 'lpbuildd/tests/buildlog'
--- lpbuildd/tests/buildlog 2017-08-05 10:06:15 +0000
+++ lpbuildd/tests/buildlog 2019-02-11 12:23:51 +0000
@@ -1,10 +1,10 @@
-RUN: /usr/share/launchpad-buildd/slavebin/unpack-chroot 370614-896976 /home/buildd/filecache-default/a40e3c410938399b35051833fe5244f9ac6f3774
+RUN: /usr/share/launchpad-buildd/bin/unpack-chroot 370614-896976 /home/buildd/filecache-default/a40e3c410938399b35051833fe5244f9ac6f3774
Unpacking chroot for build 370614-896976
-RUN: /usr/share/launchpad-buildd/slavebin/mount-chroot 370614-896976
+RUN: /usr/share/launchpad-buildd/bin/mount-chroot 370614-896976
Mounting chroot for build 370614-896976
-RUN: /usr/share/launchpad-buildd/slavebin/apply-ogre-model 370614-896976 universe
+RUN: /usr/share/launchpad-buildd/bin/apply-ogre-model 370614-896976 universe
Attempting OGRE for universe in build-370614-896976
-RUN: /usr/share/launchpad-buildd/slavebin/update-debian-chroot 370614-896976
+RUN: /usr/share/launchpad-buildd/bin/update-debian-chroot 370614-896976
Updating debian chroot for build 370614-896976
Get:1 http://buildd:secret@ftpmaster.internal gutsy Release.gpg [191B]
Get:2 http://ftpmaster.internal gutsy Release [65.9kB]
=== modified file 'lpbuildd/tests/buildlog.long'
--- lpbuildd/tests/buildlog.long 2017-08-05 10:06:15 +0000
+++ lpbuildd/tests/buildlog.long 2019-02-11 12:23:51 +0000
@@ -1,10 +1,10 @@
-RUN: /usr/share/launchpad-buildd/slavebin/unpack-chroot 370614-896976 /home/buildd/filecache-default/a40e3c410938399b35051833fe5244f9ac6f3774
+RUN: /usr/share/launchpad-buildd/bin/unpack-chroot 370614-896976 /home/buildd/filecache-default/a40e3c410938399b35051833fe5244f9ac6f3774
Unpacking chroot for build 370614-896976
-RUN: /usr/share/launchpad-buildd/slavebin/mount-chroot 370614-896976
+RUN: /usr/share/launchpad-buildd/bin/mount-chroot 370614-896976
Mounting chroot for build 370614-896976
-RUN: /usr/share/launchpad-buildd/slavebin/apply-ogre-model 370614-896976 universe
+RUN: /usr/share/launchpad-buildd/bin/apply-ogre-model 370614-896976 universe
Attempting OGRE for universe in build-370614-896976
-RUN: /usr/share/launchpad-buildd/slavebin/update-debian-chroot 370614-896976
+RUN: /usr/share/launchpad-buildd/bin/update-debian-chroot 370614-896976
Updating debian chroot for build 370614-896976
Get:1 http://buildd:secret@ftpmaster.internal gutsy Release.gpg [191B]
Get:2 http://ftpmaster.internal gutsy Release [65.9kB]
@@ -22,59 +22,59 @@
After unpacking 94.2kB of additional disk space will be used.
(Reading database ... 8942 files and directories currently installed.)
socat STDIO PROXY:snap-proxy.launchpad.dev:github.com:443,proxyport=3128,proxyauth=user:blah
-RUN: /usr/share/launchpad-buildd/slavebin/unpack-chroot 370614-896976 /home/buildd/filecache-default/a40e3c410938399b35051833fe5244f9ac6f3774
-Unpacking chroot for build 370614-896976
-RUN: /usr/share/launchpad-buildd/slavebin/mount-chroot 370614-896976
-Mounting chroot for build 370614-896976
-RUN: /usr/share/launchpad-buildd/slavebin/apply-ogre-model 370614-896976 universe
-Attempting OGRE for universe in build-370614-896976
-RUN: /usr/share/launchpad-buildd/slavebin/update-debian-chroot 370614-896976
-Updating debian chroot for build 370614-896976
-Get:1 http://buildd:secret@ftpmaster.internal gutsy Release.gpg [191B]
-Get:2 http://ftpmaster.internal gutsy Release [65.9kB]
-Get:3 http://user:blah@ftpmaster.internal gutsy/main Packages [1085kB]
-Get:4 http://ftpmaster.internal gutsy/universe Packages [3991kB]
-Fetched 5142kB in 5s (1012kB/s)
-Reading package lists...
-Reading package lists...
-Building dependency tree...
-The following packages will be upgraded:
- apt bsdutils cpp g++ gcc initscripts libdb4.4 mount pkgbinarymangler sysv-rc
- sysvutils util-linux
-12 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/2832kB of archives.
-After unpacking 94.2kB of additional disk space will be used.
-(Reading database ... 8942 files and directories currently installed.)
-RUN: /usr/share/launchpad-buildd/slavebin/unpack-chroot 370614-896976 /home/buildd/filecache-default/a40e3c410938399b35051833fe5244f9ac6f3774
-Unpacking chroot for build 370614-896976
-RUN: /usr/share/launchpad-buildd/slavebin/mount-chroot 370614-896976
-Mounting chroot for build 370614-896976
-RUN: /usr/share/launchpad-buildd/slavebin/apply-ogre-model 370614-896976 universe
-Attempting OGRE for universe in build-370614-896976
-RUN: /usr/share/launchpad-buildd/slavebin/update-debian-chroot 370614-896976
-Updating debian chroot for build 370614-896976
-Get:1 http://buildd:secret@ftpmaster.internal gutsy Release.gpg [191B]
-Get:2 http://ftpmaster.internal gutsy Release [65.9kB]
-Get:3 http://user:blah@ftpmaster.internal gutsy/main Packages [1085kB]
-Get:4 http://ftpmaster.internal gutsy/universe Packages [3991kB]
-Fetched 5142kB in 5s (1012kB/s)
-Reading package lists...
-Reading package lists...
-Building dependency tree...
-The following packages will be upgraded:
- apt bsdutils cpp g++ gcc initscripts libdb4.4 mount pkgbinarymangler sysv-rc
- sysvutils util-linux
-12 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
-Need to get 0B/2832kB of archives.
-After unpacking 94.2kB of additional disk space will be used.
-(Reading database ... 8942 files and directories currently installed.)
-RUN: /usr/share/launchpad-buildd/slavebin/unpack-chroot 370614-896976 /home/buildd/filecache-default/a40e3c410938399b35051833fe5244f9ac6f3774
-Unpacking chroot for build 370614-896976
-RUN: /usr/share/launchpad-buildd/slavebin/mount-chroot 370614-896976
-Mounting chroot for build 370614-896976
-RUN: /usr/share/launchpad-buildd/slavebin/apply-ogre-model 370614-896976 universe
-Attempting OGRE for universe in build-370614-896976
-RUN: /usr/share/launchpad-buildd/slavebin/update-debian-chroot 370614-896976
+RUN: /usr/share/launchpad-buildd/bin/unpack-chroot 370614-896976 /home/buildd/filecache-default/a40e3c410938399b35051833fe5244f9ac6f3774
+Unpacking chroot for build 370614-896976
+RUN: /usr/share/launchpad-buildd/bin/mount-chroot 370614-896976
+Mounting chroot for build 370614-896976
+RUN: /usr/share/launchpad-buildd/bin/apply-ogre-model 370614-896976 universe
+Attempting OGRE for universe in build-370614-896976
+RUN: /usr/share/launchpad-buildd/bin/update-debian-chroot 370614-896976
+Updating debian chroot for build 370614-896976
+Get:1 http://buildd:secret@ftpmaster.internal gutsy Release.gpg [191B]
+Get:2 http://ftpmaster.internal gutsy Release [65.9kB]
+Get:3 http://user:blah@ftpmaster.internal gutsy/main Packages [1085kB]
+Get:4 http://ftpmaster.internal gutsy/universe Packages [3991kB]
+Fetched 5142kB in 5s (1012kB/s)
+Reading package lists...
+Reading package lists...
+Building dependency tree...
+The following packages will be upgraded:
+ apt bsdutils cpp g++ gcc initscripts libdb4.4 mount pkgbinarymangler sysv-rc
+ sysvutils util-linux
+12 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Need to get 0B/2832kB of archives.
+After unpacking 94.2kB of additional disk space will be used.
+(Reading database ... 8942 files and directories currently installed.)
+RUN: /usr/share/launchpad-buildd/bin/unpack-chroot 370614-896976 /home/buildd/filecache-default/a40e3c410938399b35051833fe5244f9ac6f3774
+Unpacking chroot for build 370614-896976
+RUN: /usr/share/launchpad-buildd/bin/mount-chroot 370614-896976
+Mounting chroot for build 370614-896976
+RUN: /usr/share/launchpad-buildd/bin/apply-ogre-model 370614-896976 universe
+Attempting OGRE for universe in build-370614-896976
+RUN: /usr/share/launchpad-buildd/bin/update-debian-chroot 370614-896976
+Updating debian chroot for build 370614-896976
+Get:1 http://buildd:secret@ftpmaster.internal gutsy Release.gpg [191B]
+Get:2 http://ftpmaster.internal gutsy Release [65.9kB]
+Get:3 http://user:blah@ftpmaster.internal gutsy/main Packages [1085kB]
+Get:4 http://ftpmaster.internal gutsy/universe Packages [3991kB]
+Fetched 5142kB in 5s (1012kB/s)
+Reading package lists...
+Reading package lists...
+Building dependency tree...
+The following packages will be upgraded:
+ apt bsdutils cpp g++ gcc initscripts libdb4.4 mount pkgbinarymangler sysv-rc
+ sysvutils util-linux
+12 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+Need to get 0B/2832kB of archives.
+After unpacking 94.2kB of additional disk space will be used.
+(Reading database ... 8942 files and directories currently installed.)
+RUN: /usr/share/launchpad-buildd/bin/unpack-chroot 370614-896976 /home/buildd/filecache-default/a40e3c410938399b35051833fe5244f9ac6f3774
+Unpacking chroot for build 370614-896976
+RUN: /usr/share/launchpad-buildd/bin/mount-chroot 370614-896976
+Mounting chroot for build 370614-896976
+RUN: /usr/share/launchpad-buildd/bin/apply-ogre-model 370614-896976 universe
+Attempting OGRE for universe in build-370614-896976
+RUN: /usr/share/launchpad-buildd/bin/update-debian-chroot 370614-896976
Updating debian chroot for build 370614-896976
Get:1 http://buildd:secret@ftpmaster.internal gutsy Release.gpg [191B]
Get:2 http://must:go@ftpmaster.internal gutsy Release [65.9kB]
=== modified file 'lpbuildd/tests/test_1.diff'
--- lpbuildd/tests/test_1.diff 2017-08-05 10:06:15 +0000
+++ lpbuildd/tests/test_1.diff 2019-02-11 12:23:51 +0000
@@ -5,7 +5,7 @@
@@ -6,9 +6,9 @@
Attempting OGRE for universe in build-370614-896976
- RUN: /usr/share/launchpad-buildd/slavebin/update-debian-chroot 370614-896976
+ RUN: /usr/share/launchpad-buildd/bin/update-debian-chroot 370614-896976
Updating debian chroot for build 370614-896976
-Get:1 http://buildd:secret@ftpmaster.internal gutsy Release.gpg [191B]
+Get:1 http://ftpmaster.internal gutsy Release.gpg [191B]
=== modified file 'lpbuildd/tests/test_2.diff'
--- lpbuildd/tests/test_2.diff 2017-08-05 10:06:15 +0000
+++ lpbuildd/tests/test_2.diff 2019-02-11 12:23:51 +0000
@@ -2,13 +2,14 @@
+++
-@@ -1,12 +1,11 @@
+@@ -1,13 +1,12 @@
--are/launchpad-buildd/slavebin/mount-chroot 370614-896976
+-or build 370614-896976
+ RUN: /usr/share/launchpad-buildd/bin/mount-chroot 370614-896976
Mounting chroot for build 370614-896976
- RUN: /usr/share/launchpad-buildd/slavebin/apply-ogre-model 370614-896976 universe
+ RUN: /usr/share/launchpad-buildd/bin/apply-ogre-model 370614-896976 universe
Attempting OGRE for universe in build-370614-896976
- RUN: /usr/share/launchpad-buildd/slavebin/update-debian-chroot 370614-896976
+ RUN: /usr/share/launchpad-buildd/bin/update-debian-chroot 370614-896976
Updating debian chroot for build 370614-896976
-Get:1 http://buildd:secret@ftpmaster.internal gutsy Release.gpg [191B]
+Get:1 http://ftpmaster.internal gutsy Release.gpg [191B]
@@ -18,10 +19,10 @@
Get:4 http://ftpmaster.internal gutsy/universe Packages [3991kB]
Fetched 5142kB in 5s (1012kB/s)
Reading package lists...
-@@ -27,9 +26,9 @@
+@@ -28,9 +27,9 @@
Attempting OGRE for universe in build-370614-896976
- RUN: /usr/share/launchpad-buildd/slavebin/update-debian-chroot 370614-896976
+ RUN: /usr/share/launchpad-buildd/bin/update-debian-chroot 370614-896976
Updating debian chroot for build 370614-896976
-Get:1 http://buildd:secret@ftpmaster.internal gutsy Release.gpg [191B]
-Get:2 http://must:go@ftpmaster.internal gutsy Release [65.9kB]
=== modified file 'lpbuildd/tests/test_binarypackage.py'
--- lpbuildd/tests/test_binarypackage.py 2018-10-05 15:43:40 +0000
+++ lpbuildd/tests/test_binarypackage.py 2019-02-11 12:23:51 +0000
@@ -133,7 +133,7 @@
self.assertState(
BinaryPackageBuildState.SBUILD,
[
- 'sharepath/slavebin/sbuild-package', 'sbuild-package',
+ 'sharepath/bin/sbuild-package', 'sbuild-package',
self.buildid, 'i386', 'warty',
'-c', 'chroot:build-' + self.buildid,
'--arch=i386', '--dist=warty', '--nolog',
@@ -159,8 +159,7 @@
yield self.buildmanager.iterate(exit_code)
self.assertState(
BinaryPackageBuildState.SBUILD,
- ['sharepath/slavebin/in-target', 'in-target',
- 'scan-for-processes',
+ ['sharepath/bin/in-target', 'in-target', 'scan-for-processes',
'--backend=chroot', '--series=warty', '--arch=i386',
self.buildid], final=False)
@@ -168,8 +167,7 @@
self.buildmanager.iterateReap(self.getState(), 0)
self.assertState(
BinaryPackageBuildState.UMOUNT,
- ['sharepath/slavebin/in-target', 'in-target',
- 'umount-chroot',
+ ['sharepath/bin/in-target', 'in-target', 'umount-chroot',
'--backend=chroot', '--series=warty', '--arch=i386',
self.buildid], final=True)
@@ -211,7 +209,7 @@
yield self.buildmanager.iterate(0)
self.assertState(
BinaryPackageBuildState.SBUILD,
- ['sharepath/slavebin/sbuild-package', 'sbuild-package',
+ ['sharepath/bin/sbuild-package', 'sbuild-package',
self.buildid, 'i386', 'warty',
'-c', 'chroot:build-' + self.buildid,
'--arch=i386', '--dist=warty', '--nolog',
@@ -241,7 +239,7 @@
yield self.buildmanager.iterate(0)
self.assertState(
BinaryPackageBuildState.SBUILD,
- ['sharepath/slavebin/sbuild-package', 'sbuild-package',
+ ['sharepath/bin/sbuild-package', 'sbuild-package',
self.buildid, 'i386', 'warty',
'-c', 'chroot:build-' + self.buildid,
'--arch=i386', '--dist=warty', '--nolog',
@@ -267,8 +265,7 @@
self.buildmanager.abort()
self.assertState(
BinaryPackageBuildState.SBUILD,
- ['sharepath/slavebin/in-target', 'in-target',
- 'scan-for-processes',
+ ['sharepath/bin/in-target', 'in-target', 'scan-for-processes',
'--backend=chroot', '--series=warty', '--arch=i386',
self.buildid], final=False)
self.assertFalse(self.slave.wasCalled('buildFail'))
@@ -289,8 +286,7 @@
self.buildmanager.abort()
self.assertState(
BinaryPackageBuildState.SBUILD,
- ['sharepath/slavebin/in-target', 'in-target',
- 'scan-for-processes',
+ ['sharepath/bin/in-target', 'in-target', 'scan-for-processes',
'--backend=chroot', '--series=warty', '--arch=i386',
self.buildid], final=False)
self.assertFalse(self.slave.wasCalled('builderFail'))
@@ -315,8 +311,7 @@
yield self.buildmanager.iterate(128 + 9) # SIGKILL
self.assertState(
BinaryPackageBuildState.UMOUNT,
- ['sharepath/slavebin/in-target', 'in-target',
- 'umount-chroot',
+ ['sharepath/bin/in-target', 'in-target', 'umount-chroot',
'--backend=chroot', '--series=warty', '--arch=i386',
self.buildid], final=True)
@@ -332,16 +327,14 @@
self.buildmanager.abort()
self.assertState(
BinaryPackageBuildState.INIT,
- ['sharepath/slavebin/in-target', 'in-target',
- 'scan-for-processes',
+ ['sharepath/bin/in-target', 'in-target', 'scan-for-processes',
'--backend=chroot', '--series=warty', '--arch=i386',
self.buildid], final=False)
yield self.buildmanager.iterate(0)
self.assertState(
BinaryPackageBuildState.CLEANUP,
- ['sharepath/slavebin/in-target', 'in-target',
- 'remove-build',
+ ['sharepath/bin/in-target', 'in-target', 'remove-build',
'--backend=chroot', '--series=warty', '--arch=i386',
self.buildid],
final=True)
=== modified file 'lpbuildd/tests/test_debian.py'
--- lpbuildd/tests/test_debian.py 2019-02-08 15:54:20 +0000
+++ lpbuildd/tests/test_debian.py 2019-02-11 12:23:51 +0000
@@ -86,7 +86,7 @@
self.buildmanager.initiate({}, 'chroot.tar.gz', extra_args)
self.assertEqual(DebianBuildState.INIT, self.getState())
self.assertEqual(
- (['sharepath/slavebin/builder-prep', 'builder-prep'], None),
+ (['sharepath/bin/builder-prep', 'builder-prep'], None),
self.buildmanager.commands[-1])
self.assertEqual(
self.buildmanager.iterate, self.buildmanager.iterators[-1])
@@ -105,8 +105,7 @@
self.buildmanager.iterate(0)
self.assertEqual(DebianBuildState.UNPACK, self.getState())
self.assertEqual(
- (['sharepath/slavebin/in-target', 'in-target',
- 'unpack-chroot',
+ (['sharepath/bin/in-target', 'in-target', 'unpack-chroot',
'--backend=chroot', '--series=xenial', '--arch=amd64',
self.buildid,
'--image-type', 'chroot',
@@ -119,8 +118,7 @@
self.buildmanager.iterate(0)
self.assertEqual(DebianBuildState.MOUNT, self.getState())
self.assertEqual(
- (['sharepath/slavebin/in-target', 'in-target',
- 'mount-chroot',
+ (['sharepath/bin/in-target', 'in-target', 'mount-chroot',
'--backend=chroot', '--series=xenial', '--arch=amd64',
self.buildid],
None),
@@ -131,8 +129,7 @@
self.buildmanager.iterate(0)
self.assertEqual(DebianBuildState.SOURCES, self.getState())
self.assertEqual(
- (['sharepath/slavebin/in-target', 'in-target',
- 'override-sources-list',
+ (['sharepath/bin/in-target', 'in-target', 'override-sources-list',
'--backend=chroot', '--series=xenial', '--arch=amd64',
self.buildid,
'deb http://ppa.launchpad.dev/owner/name/ubuntu xenial main'],
@@ -144,8 +141,7 @@
self.buildmanager.iterate(0)
self.assertEqual(DebianBuildState.UPDATE, self.getState())
self.assertEqual(
- (['sharepath/slavebin/in-target', 'in-target',
- 'update-debian-chroot',
+ (['sharepath/bin/in-target', 'in-target', 'update-debian-chroot',
'--backend=chroot', '--series=xenial', '--arch=amd64',
self.buildid],
None),
@@ -163,8 +159,7 @@
self.buildmanager.iterate(0)
self.assertEqual(MockBuildState.MAIN, self.getState())
self.assertEqual(
- (['sharepath/slavebin/in-target', 'in-target',
- 'scan-for-processes',
+ (['sharepath/bin/in-target', 'in-target', 'scan-for-processes',
'--backend=chroot', '--series=xenial', '--arch=amd64',
self.buildid],
None),
@@ -175,8 +170,7 @@
self.buildmanager.iterateReap(self.getState(), 0)
self.assertEqual(DebianBuildState.UMOUNT, self.getState())
self.assertEqual(
- (['sharepath/slavebin/in-target', 'in-target',
- 'umount-chroot',
+ (['sharepath/bin/in-target', 'in-target', 'umount-chroot',
'--backend=chroot', '--series=xenial', '--arch=amd64',
self.buildid],
None),
@@ -187,8 +181,7 @@
self.buildmanager.iterate(0)
self.assertEqual(DebianBuildState.CLEANUP, self.getState())
self.assertEqual(
- (['sharepath/slavebin/in-target', 'in-target',
- 'remove-build',
+ (['sharepath/bin/in-target', 'in-target', 'remove-build',
'--backend=chroot', '--series=xenial', '--arch=amd64',
self.buildid],
None),
@@ -220,8 +213,7 @@
self.buildmanager.iterate(0)
self.assertEqual(DebianBuildState.UNPACK, self.getState())
self.assertEqual(
- (['sharepath/slavebin/in-target', 'in-target',
- 'unpack-chroot',
+ (['sharepath/bin/in-target', 'in-target', 'unpack-chroot',
'--backend=chroot', '--series=xenial', '--arch=amd64',
self.buildid,
'--image-type', 'chroot',
@@ -234,8 +226,7 @@
self.buildmanager.iterate(0)
self.assertEqual(DebianBuildState.MOUNT, self.getState())
self.assertEqual(
- (['sharepath/slavebin/in-target', 'in-target',
- 'mount-chroot',
+ (['sharepath/bin/in-target', 'in-target', 'mount-chroot',
'--backend=chroot', '--series=xenial', '--arch=amd64',
self.buildid],
None),
@@ -246,8 +237,7 @@
self.buildmanager.iterate(0)
self.assertEqual(DebianBuildState.SOURCES, self.getState())
self.assertEqual(
- (['sharepath/slavebin/in-target', 'in-target',
- 'override-sources-list',
+ (['sharepath/bin/in-target', 'in-target', 'override-sources-list',
'--backend=chroot', '--series=xenial', '--arch=amd64',
self.buildid,
'deb http://ppa.launchpad.dev/owner/name/ubuntu xenial main'],
@@ -259,8 +249,7 @@
self.buildmanager.iterate(0)
self.assertEqual(DebianBuildState.KEYS, self.getState())
self.assertEqual(
- (['sharepath/slavebin/in-target', 'in-target',
- 'add-trusted-keys',
+ (['sharepath/bin/in-target', 'in-target', 'add-trusted-keys',
'--backend=chroot', '--series=xenial', '--arch=amd64',
self.buildid],
b'key material'),
@@ -271,8 +260,7 @@
self.buildmanager.iterate(0)
self.assertEqual(DebianBuildState.UPDATE, self.getState())
self.assertEqual(
- (['sharepath/slavebin/in-target', 'in-target',
- 'update-debian-chroot',
+ (['sharepath/bin/in-target', 'in-target', 'update-debian-chroot',
'--backend=chroot', '--series=xenial', '--arch=amd64',
self.buildid],
None),
@@ -290,8 +278,7 @@
self.buildmanager.iterate(0)
self.assertEqual(MockBuildState.MAIN, self.getState())
self.assertEqual(
- (['sharepath/slavebin/in-target', 'in-target',
- 'scan-for-processes',
+ (['sharepath/bin/in-target', 'in-target', 'scan-for-processes',
'--backend=chroot', '--series=xenial', '--arch=amd64',
self.buildid],
None),
@@ -302,8 +289,7 @@
self.buildmanager.iterateReap(self.getState(), 0)
self.assertEqual(DebianBuildState.UMOUNT, self.getState())
self.assertEqual(
- (['sharepath/slavebin/in-target', 'in-target',
- 'umount-chroot',
+ (['sharepath/bin/in-target', 'in-target', 'umount-chroot',
'--backend=chroot', '--series=xenial', '--arch=amd64',
self.buildid],
None),
@@ -314,8 +300,7 @@
self.buildmanager.iterate(0)
self.assertEqual(DebianBuildState.CLEANUP, self.getState())
self.assertEqual(
- (['sharepath/slavebin/in-target', 'in-target',
- 'remove-build',
+ (['sharepath/bin/in-target', 'in-target', 'remove-build',
'--backend=chroot', '--series=xenial', '--arch=amd64',
self.buildid],
None),
@@ -349,8 +334,7 @@
self.buildmanager.iterate(0)
self.assertEqual(DebianBuildState.UNPACK, self.getState())
self.assertEqual(
- (['sharepath/slavebin/in-target', 'in-target',
- 'unpack-chroot',
+ (['sharepath/bin/in-target', 'in-target', 'unpack-chroot',
'--backend=chroot', '--series=xenial', '--arch=amd64',
self.buildid,
'--image-type', 'chroot',
@@ -363,8 +347,7 @@
self.buildmanager.iterate(0)
self.assertEqual(DebianBuildState.MOUNT, self.getState())
self.assertEqual(
- (['sharepath/slavebin/in-target', 'in-target',
- 'mount-chroot',
+ (['sharepath/bin/in-target', 'in-target', 'mount-chroot',
'--backend=chroot', '--series=xenial', '--arch=amd64',
self.buildid],
None),
@@ -375,8 +358,7 @@
self.buildmanager.iterate(0)
self.assertEqual(DebianBuildState.SOURCES, self.getState())
self.assertEqual(
- (['sharepath/slavebin/in-target', 'in-target',
- 'override-sources-list',
+ (['sharepath/bin/in-target', 'in-target', 'override-sources-list',
'--backend=chroot', '--series=xenial', '--arch=amd64',
self.buildid,
'deb http://ppa.launchpad.dev/owner/name/ubuntu xenial main'],
@@ -388,8 +370,7 @@
self.buildmanager.iterate(0)
self.assertEqual(DebianBuildState.UPDATE, self.getState())
self.assertEqual(
- (['sharepath/slavebin/in-target', 'in-target',
- 'update-debian-chroot',
+ (['sharepath/bin/in-target', 'in-target', 'update-debian-chroot',
'--backend=chroot', '--series=xenial', '--arch=amd64',
self.buildid],
None),
@@ -407,8 +388,7 @@
self.buildmanager.iterate(0)
self.assertEqual(MockBuildState.MAIN, self.getState())
self.assertEqual(
- (['sharepath/slavebin/in-target', 'in-target',
- 'scan-for-processes',
+ (['sharepath/bin/in-target', 'in-target', 'scan-for-processes',
'--backend=chroot', '--series=xenial', '--arch=amd64',
self.buildid],
None),
@@ -438,8 +418,7 @@
self.buildmanager.iterate(0)
self.assertEqual(DebianBuildState.UNPACK, self.getState())
self.assertEqual(
- (['sharepath/slavebin/in-target', 'in-target',
- 'unpack-chroot',
+ (['sharepath/bin/in-target', 'in-target', 'unpack-chroot',
'--backend=lxd', '--series=xenial', '--arch=amd64',
self.buildid,
'--image-type', 'lxd',
=== modified file 'lpbuildd/tests/test_livefs.py'
--- lpbuildd/tests/test_livefs.py 2018-10-05 15:43:40 +0000
+++ lpbuildd/tests/test_livefs.py 2019-02-11 12:23:51 +0000
@@ -81,8 +81,7 @@
self.assertEqual(
LiveFilesystemBuildState.BUILD_LIVEFS, self.getState())
expected_command = [
- "sharepath/slavebin/in-target", "in-target",
- "buildlivefs",
+ "sharepath/bin/in-target", "in-target", "buildlivefs",
"--backend=lxd", "--series=saucy", "--arch=i386", self.buildid,
"--project", "ubuntu",
]
@@ -106,8 +105,7 @@
# After building the package, reap processes.
yield self.buildmanager.iterate(0)
expected_command = [
- "sharepath/slavebin/in-target", "in-target",
- "scan-for-processes",
+ "sharepath/bin/in-target", "in-target", "scan-for-processes",
"--backend=lxd", "--series=saucy", "--arch=i386", self.buildid,
]
self.assertEqual(
@@ -123,8 +121,7 @@
# Control returns to the DebianBuildManager in the UMOUNT state.
self.buildmanager.iterateReap(self.getState(), 0)
expected_command = [
- "sharepath/slavebin/in-target", "in-target",
- "umount-chroot",
+ "sharepath/bin/in-target", "in-target", "umount-chroot",
"--backend=lxd", "--series=saucy", "--arch=i386", self.buildid,
]
self.assertEqual(LiveFilesystemBuildState.UMOUNT, self.getState())
=== modified file 'lpbuildd/tests/test_snap.py'
--- lpbuildd/tests/test_snap.py 2018-10-05 15:43:40 +0000
+++ lpbuildd/tests/test_snap.py 2019-02-11 12:23:51 +0000
@@ -96,8 +96,7 @@
yield self.buildmanager.iterate(0)
self.assertEqual(SnapBuildState.BUILD_SNAP, self.getState())
expected_command = [
- "sharepath/slavebin/in-target", "in-target",
- "buildsnap",
+ "sharepath/bin/in-target", "in-target", "buildsnap",
"--backend=lxd", "--series=xenial", "--arch=i386", self.buildid,
"--git-repository", "https://git.launchpad.dev/~example/+git/snap";,
"--git-path", "master",
@@ -135,8 +134,7 @@
# After building the package, reap processes.
yield self.buildmanager.iterate(0)
expected_command = [
- "sharepath/slavebin/in-target", "in-target",
- "scan-for-processes",
+ "sharepath/bin/in-target", "in-target", "scan-for-processes",
"--backend=lxd", "--series=xenial", "--arch=i386", self.buildid,
]
self.assertEqual(SnapBuildState.BUILD_SNAP, self.getState())
@@ -151,8 +149,7 @@
# Control returns to the DebianBuildManager in the UMOUNT state.
self.buildmanager.iterateReap(self.getState(), 0)
expected_command = [
- "sharepath/slavebin/in-target", "in-target",
- "umount-chroot",
+ "sharepath/bin/in-target", "in-target", "umount-chroot",
"--backend=lxd", "--series=xenial", "--arch=i386", self.buildid,
]
self.assertEqual(SnapBuildState.UMOUNT, self.getState())
@@ -179,8 +176,7 @@
# After building the package, reap processes.
yield self.buildmanager.iterate(0)
expected_command = [
- "sharepath/slavebin/in-target", "in-target",
- "scan-for-processes",
+ "sharepath/bin/in-target", "in-target", "scan-for-processes",
"--backend=lxd", "--series=xenial", "--arch=i386", self.buildid,
]
self.assertEqual(SnapBuildState.BUILD_SNAP, self.getState())
@@ -196,8 +192,7 @@
# Control returns to the DebianBuildManager in the UMOUNT state.
self.buildmanager.iterateReap(self.getState(), 0)
expected_command = [
- "sharepath/slavebin/in-target", "in-target",
- "umount-chroot",
+ "sharepath/bin/in-target", "in-target", "umount-chroot",
"--backend=lxd", "--series=xenial", "--arch=i386", self.buildid,
]
self.assertEqual(SnapBuildState.UMOUNT, self.getState())
@@ -225,8 +220,7 @@
# After building the package, reap processes.
yield self.buildmanager.iterate(0)
expected_command = [
- "sharepath/slavebin/in-target", "in-target",
- "scan-for-processes",
+ "sharepath/bin/in-target", "in-target", "scan-for-processes",
"--backend=lxd", "--series=xenial", "--arch=i386", self.buildid,
]
self.assertEqual(SnapBuildState.BUILD_SNAP, self.getState())
@@ -242,8 +236,7 @@
# Control returns to the DebianBuildManager in the UMOUNT state.
self.buildmanager.iterateReap(self.getState(), 0)
expected_command = [
- "sharepath/slavebin/in-target", "in-target",
- "umount-chroot",
+ "sharepath/bin/in-target", "in-target", "umount-chroot",
"--backend=lxd", "--series=xenial", "--arch=i386", self.buildid,
]
self.assertEqual(SnapBuildState.UMOUNT, self.getState())
=== modified file 'lpbuildd/tests/test_sourcepackagerecipe.py'
--- lpbuildd/tests/test_sourcepackagerecipe.py 2018-10-05 15:43:40 +0000
+++ lpbuildd/tests/test_sourcepackagerecipe.py 2019-02-11 12:23:51 +0000
@@ -93,8 +93,7 @@
yield self.buildmanager.iterate(0)
self.assertEqual(
SourcePackageRecipeBuildState.BUILD_RECIPE, self.getState())
- expected_command = [
- 'sharepath/slavebin/buildrecipe', 'buildrecipe']
+ expected_command = ['sharepath/bin/buildrecipe', 'buildrecipe']
if git:
expected_command.append('--git')
expected_command.extend([
@@ -130,8 +129,7 @@
# After building the package, reap processes.
yield self.buildmanager.iterate(0)
expected_command = [
- 'sharepath/slavebin/in-target', 'in-target',
- 'scan-for-processes',
+ 'sharepath/bin/in-target', 'in-target', 'scan-for-processes',
'--backend=chroot', '--series=maverick', '--arch=i386',
self.buildid,
]
@@ -149,8 +147,7 @@
# Control returns to the DebianBuildManager in the UMOUNT state.
self.buildmanager.iterateReap(self.getState(), 0)
expected_command = [
- 'sharepath/slavebin/in-target', 'in-target',
- 'umount-chroot',
+ 'sharepath/bin/in-target', 'in-target', 'umount-chroot',
'--backend=chroot', '--series=maverick', '--arch=i386',
self.buildid,
]
@@ -176,8 +173,7 @@
# The buildmanager calls depFail correctly and reaps processes.
yield self.buildmanager.iterate(RETCODE_FAILURE_INSTALL_BUILD_DEPS)
expected_command = [
- 'sharepath/slavebin/in-target', 'in-target',
- 'scan-for-processes',
+ 'sharepath/bin/in-target', 'in-target', 'scan-for-processes',
'--backend=chroot', '--series=maverick', '--arch=i386',
self.buildid,
]
@@ -193,8 +189,7 @@
# Control returns to the DebianBuildManager in the UMOUNT state.
self.buildmanager.iterateReap(self.getState(), 0)
expected_command = [
- 'sharepath/slavebin/in-target', 'in-target',
- 'umount-chroot',
+ 'sharepath/bin/in-target', 'in-target', 'umount-chroot',
'--backend=chroot', '--series=maverick', '--arch=i386',
self.buildid,
]
@@ -217,8 +212,7 @@
# The buildmanager calls buildFail correctly and reaps processes.
yield self.buildmanager.iterate(RETCODE_FAILURE_INSTALL_BUILD_DEPS)
expected_command = [
- 'sharepath/slavebin/in-target', 'in-target',
- 'scan-for-processes',
+ 'sharepath/bin/in-target', 'in-target', 'scan-for-processes',
'--backend=chroot', '--series=maverick', '--arch=i386',
self.buildid,
]
@@ -233,8 +227,7 @@
# Control returns to the DebianBuildManager in the UMOUNT state.
self.buildmanager.iterateReap(self.getState(), 0)
expected_command = [
- 'sharepath/slavebin/in-target', 'in-target',
- 'umount-chroot',
+ 'sharepath/bin/in-target', 'in-target', 'umount-chroot',
'--backend=chroot', '--series=maverick', '--arch=i386',
self.buildid,
]
=== modified file 'lpbuildd/tests/test_translationtemplatesbuildmanager.py'
--- lpbuildd/tests/test_translationtemplatesbuildmanager.py 2018-10-05 15:43:40 +0000
+++ lpbuildd/tests/test_translationtemplatesbuildmanager.py 2019-02-11 12:23:51 +0000
@@ -84,7 +84,7 @@
self.assertEqual(
TranslationTemplatesBuildState.GENERATE, self.getState())
expected_command = [
- 'sharepath/slavebin/in-target', 'in-target',
+ 'sharepath/bin/in-target', 'in-target',
'generate-translation-templates',
'--backend=chroot', '--series=xenial', '--arch=i386',
self.buildid,
@@ -103,8 +103,7 @@
# After generating templates, reap processes.
yield self.buildmanager.iterate(0)
expected_command = [
- 'sharepath/slavebin/in-target', 'in-target',
- 'scan-for-processes',
+ 'sharepath/bin/in-target', 'in-target', 'scan-for-processes',
'--backend=chroot', '--series=xenial', '--arch=i386',
self.buildid,
]
@@ -122,8 +121,7 @@
# The control returns to the DebianBuildManager in the UMOUNT state.
self.buildmanager.iterateReap(self.getState(), 0)
expected_command = [
- 'sharepath/slavebin/in-target', 'in-target',
- 'umount-chroot',
+ 'sharepath/bin/in-target', 'in-target', 'umount-chroot',
'--backend=chroot', '--series=xenial', '--arch=i386',
self.buildid,
]
@@ -152,8 +150,7 @@
self.assertEqual(
TranslationTemplatesBuildState.GENERATE, self.getState())
expected_command = [
- 'sharepath/slavebin/in-target', 'in-target',
- 'scan-for-processes',
+ 'sharepath/bin/in-target', 'in-target', 'scan-for-processes',
'--backend=chroot', '--series=xenial', '--arch=i386',
self.buildid,
]
@@ -167,8 +164,7 @@
self.assertEqual(
TranslationTemplatesBuildState.UMOUNT, self.getState())
expected_command = [
- 'sharepath/slavebin/in-target', 'in-target',
- 'umount-chroot',
+ 'sharepath/bin/in-target', 'in-target', 'umount-chroot',
'--backend=chroot', '--series=xenial', '--arch=i386',
self.buildid,
]
@@ -192,8 +188,7 @@
# The buildmanager fails and reaps processes.
yield self.buildmanager.iterate(RETCODE_FAILURE_BUILD)
expected_command = [
- 'sharepath/slavebin/in-target', 'in-target',
- 'scan-for-processes',
+ 'sharepath/bin/in-target', 'in-target', 'scan-for-processes',
'--backend=chroot', '--series=xenial', '--arch=i386',
self.buildid,
]
@@ -209,8 +204,7 @@
self.assertEqual(
TranslationTemplatesBuildState.UMOUNT, self.getState())
expected_command = [
- 'sharepath/slavebin/in-target', 'in-target',
- 'umount-chroot',
+ 'sharepath/bin/in-target', 'in-target', 'umount-chroot',
'--backend=chroot', '--series=xenial', '--arch=i386',
self.buildid,
]
