diff -Nru launchpad-buildd-213~551~ubuntu18.04.1/buildd-genconfig launchpad-buildd-213~552~ubuntu18.04.1/buildd-genconfig --- launchpad-buildd-213~551~ubuntu18.04.1/buildd-genconfig 2022-04-20 20:01:52.000000000 +0000 +++ launchpad-buildd-213~552~ubuntu18.04.1/buildd-genconfig 2022-04-21 20:02:39.000000000 +0000 @@ -37,7 +37,7 @@ "-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 -Nru launchpad-buildd-213~551~ubuntu18.04.1/debian/changelog launchpad-buildd-213~552~ubuntu18.04.1/debian/changelog --- launchpad-buildd-213~551~ubuntu18.04.1/debian/changelog 2022-04-20 20:01:52.000000000 +0000 +++ launchpad-buildd-213~552~ubuntu18.04.1/debian/changelog 2022-04-21 20:02:39.000000000 +0000 @@ -1,12 +1,13 @@ -launchpad-buildd (213~551~ubuntu18.04.1) bionic; urgency=low +launchpad-buildd (213~552~ubuntu18.04.1) bionic; urgency=low * Auto build. - -- Launchpad Package Builder Wed, 20 Apr 2022 20:01:52 +0000 + -- Launchpad Package Builder Thu, 21 Apr 2022 20:02:39 +0000 launchpad-buildd (213) UNRELEASED; urgency=medium * Dynamically generate configuration file in lpbuildd.tests.harness. + * Remove unnecessary "slave" component from some file names. -- Colin Watson Wed, 20 Apr 2022 16:03:01 +0100 diff -Nru launchpad-buildd-213~551~ubuntu18.04.1/debian/clean launchpad-buildd-213~552~ubuntu18.04.1/debian/clean --- launchpad-buildd-213~551~ubuntu18.04.1/debian/clean 2022-04-20 20:01:52.000000000 +0000 +++ launchpad-buildd-213~552~ubuntu18.04.1/debian/clean 2022-04-21 20:02:39.000000000 +0000 @@ -1 +1 @@ -buildd-slave-example.conf +buildd-example.conf diff -Nru launchpad-buildd-213~551~ubuntu18.04.1/debian/git-build-recipe.manifest launchpad-buildd-213~552~ubuntu18.04.1/debian/git-build-recipe.manifest --- launchpad-buildd-213~551~ubuntu18.04.1/debian/git-build-recipe.manifest 2022-04-20 20:01:52.000000000 +0000 +++ launchpad-buildd-213~552~ubuntu18.04.1/debian/git-build-recipe.manifest 2022-04-21 20:02:39.000000000 +0000 @@ -1,2 +1,2 @@ -# git-build-recipe format 0.4 deb-version {debupstream}~551 -lp:launchpad-buildd git-commit:e27e80ee10fc60042e128a31561595af1ccaa6a3 +# git-build-recipe format 0.4 deb-version {debupstream}~552 +lp:launchpad-buildd git-commit:c8a1861125f5696e4151a580e2b02b3f6b6847bd diff -Nru launchpad-buildd-213~551~ubuntu18.04.1/debian/launchpad-buildd.examples launchpad-buildd-213~552~ubuntu18.04.1/debian/launchpad-buildd.examples --- launchpad-buildd-213~551~ubuntu18.04.1/debian/launchpad-buildd.examples 2022-04-20 20:01:52.000000000 +0000 +++ launchpad-buildd-213~552~ubuntu18.04.1/debian/launchpad-buildd.examples 2022-04-21 20:02:39.000000000 +0000 @@ -1 +1 @@ -buildd-slave-example.conf +buildd-example.conf diff -Nru launchpad-buildd-213~551~ubuntu18.04.1/debian/launchpad-buildd.install launchpad-buildd-213~552~ubuntu18.04.1/debian/launchpad-buildd.install --- launchpad-buildd-213~551~ubuntu18.04.1/debian/launchpad-buildd.install 2022-04-20 20:01:52.000000000 +0000 +++ launchpad-buildd-213~552~ubuntu18.04.1/debian/launchpad-buildd.install 2022-04-21 20:02:39.000000000 +0000 @@ -9,4 +9,4 @@ 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 -Nru launchpad-buildd-213~551~ubuntu18.04.1/debian/launchpad-buildd.links launchpad-buildd-213~552~ubuntu18.04.1/debian/launchpad-buildd.links --- launchpad-buildd-213~551~ubuntu18.04.1/debian/launchpad-buildd.links 2022-04-20 20:01:52.000000000 +0000 +++ launchpad-buildd-213~552~ubuntu18.04.1/debian/launchpad-buildd.links 2022-04-21 20:02:39.000000000 +0000 @@ -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 -Nru launchpad-buildd-213~551~ubuntu18.04.1/debian/launchpad-buildd@.service launchpad-buildd-213~552~ubuntu18.04.1/debian/launchpad-buildd@.service --- launchpad-buildd-213~551~ubuntu18.04.1/debian/launchpad-buildd@.service 2022-04-20 20:01:52.000000000 +0000 +++ launchpad-buildd-213~552~ubuntu18.04.1/debian/launchpad-buildd@.service 2022-04-21 20:02:39.000000000 +0000 @@ -25,7 +25,7 @@ # 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 -Nru launchpad-buildd-213~551~ubuntu18.04.1/debian/rules launchpad-buildd-213~552~ubuntu18.04.1/debian/rules --- launchpad-buildd-213~551~ubuntu18.04.1/debian/rules 2022-04-20 20:01:52.000000000 +0000 +++ launchpad-buildd-213~552~ubuntu18.04.1/debian/rules 2022-04-21 20:02:39.000000000 +0000 @@ -13,9 +13,9 @@ 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 -Nru launchpad-buildd-213~551~ubuntu18.04.1/lpbuildd/buildd-slave.tac launchpad-buildd-213~552~ubuntu18.04.1/lpbuildd/buildd-slave.tac --- launchpad-buildd-213~551~ubuntu18.04.1/lpbuildd/buildd-slave.tac 2022-04-20 20:01:52.000000000 +0000 +++ launchpad-buildd-213~552~ubuntu18.04.1/lpbuildd/buildd-slave.tac 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -# Copyright 2009-2011 Canonical Ltd. This software is licensed under the -# GNU Affero General Public License version 3 (see the file LICENSE). - -# XXX: dsilvers: 2005/01/21: Currently everything logged in the builder gets -# passed through to the twistd log too. this could get dangerous/big - -try: - from configparser import ConfigParser as SafeConfigParser -except ImportError: - from ConfigParser import SafeConfigParser -import os - -from twisted.application import ( - service, - strports, - ) -from twisted.scripts.twistd import ServerOptions -from twisted.web import ( - resource, - server, - static, - ) - -from lpbuildd.binarypackage import BinaryPackageBuildManager -from lpbuildd.builder import XMLRPCBuilder -from lpbuildd.charm import CharmBuildManager -from lpbuildd.ci import CIBuildManager -from lpbuildd.oci import OCIBuildManager -from lpbuildd.livefs import LiveFilesystemBuildManager -from lpbuildd.log import RotatableFileLogObserver -from lpbuildd.snap import SnapBuildManager -from lpbuildd.sourcepackagerecipe import SourcePackageRecipeBuildManager -from lpbuildd.translationtemplates import TranslationTemplatesBuildManager - - -options = ServerOptions() -options.parseOptions() - -conffile = os.environ.get('BUILDD_CONFIG', 'buildd-slave-example.conf') - -conf = SafeConfigParser() -conf.read(conffile) -builder = XMLRPCBuilder(conf) - -builder.registerManager(BinaryPackageBuildManager, "binarypackage") -builder.registerManager(SourcePackageRecipeBuildManager, "sourcepackagerecipe") -builder.registerManager( - TranslationTemplatesBuildManager, 'translation-templates') -builder.registerManager(LiveFilesystemBuildManager, "livefs") -builder.registerManager(SnapBuildManager, "snap") -builder.registerManager(OCIBuildManager, "oci") -builder.registerManager(CharmBuildManager, "charm") -builder.registerManager(CIBuildManager, "ci") - -application = service.Application('Builder') -application.addComponent( - RotatableFileLogObserver(options.get('logfile')), ignoreClass=1) -builderService = service.IServiceCollection(application) -builder.builder.service = builderService - -root = resource.Resource() -root.putChild(b'rpc', builder) -root.putChild(b'filecache', static.File(conf.get('builder', 'filecache'))) -buildersite = server.Site(root) - -strports.service("tcp:%s" % builder.builder._config.get("builder", "bindport"), - buildersite).setServiceParent(builderService) - -# You can interact with a running builder like this: -# (assuming the builder is on localhost:8221) -# -# python3 -# from xmlrpc.client import ServerProxy -# s = ServerProxy("http://localhost:8221/rpc") -# s.echo("Hello World") diff -Nru launchpad-buildd-213~551~ubuntu18.04.1/lpbuildd/buildd.tac launchpad-buildd-213~552~ubuntu18.04.1/lpbuildd/buildd.tac --- launchpad-buildd-213~551~ubuntu18.04.1/lpbuildd/buildd.tac 1970-01-01 00:00:00.000000000 +0000 +++ launchpad-buildd-213~552~ubuntu18.04.1/lpbuildd/buildd.tac 2022-04-21 20:02:39.000000000 +0000 @@ -0,0 +1,75 @@ +# Copyright 2009-2011 Canonical Ltd. This software is licensed under the +# GNU Affero General Public License version 3 (see the file LICENSE). + +# XXX: dsilvers: 2005/01/21: Currently everything logged in the builder gets +# passed through to the twistd log too. this could get dangerous/big + +try: + from configparser import ConfigParser as SafeConfigParser +except ImportError: + from ConfigParser import SafeConfigParser +import os + +from twisted.application import ( + service, + strports, + ) +from twisted.scripts.twistd import ServerOptions +from twisted.web import ( + resource, + server, + static, + ) + +from lpbuildd.binarypackage import BinaryPackageBuildManager +from lpbuildd.builder import XMLRPCBuilder +from lpbuildd.charm import CharmBuildManager +from lpbuildd.ci import CIBuildManager +from lpbuildd.oci import OCIBuildManager +from lpbuildd.livefs import LiveFilesystemBuildManager +from lpbuildd.log import RotatableFileLogObserver +from lpbuildd.snap import SnapBuildManager +from lpbuildd.sourcepackagerecipe import SourcePackageRecipeBuildManager +from lpbuildd.translationtemplates import TranslationTemplatesBuildManager + + +options = ServerOptions() +options.parseOptions() + +conffile = os.environ.get('BUILDD_CONFIG', 'buildd-example.conf') + +conf = SafeConfigParser() +conf.read(conffile) +builder = XMLRPCBuilder(conf) + +builder.registerManager(BinaryPackageBuildManager, "binarypackage") +builder.registerManager(SourcePackageRecipeBuildManager, "sourcepackagerecipe") +builder.registerManager( + TranslationTemplatesBuildManager, 'translation-templates') +builder.registerManager(LiveFilesystemBuildManager, "livefs") +builder.registerManager(SnapBuildManager, "snap") +builder.registerManager(OCIBuildManager, "oci") +builder.registerManager(CharmBuildManager, "charm") +builder.registerManager(CIBuildManager, "ci") + +application = service.Application('Builder') +application.addComponent( + RotatableFileLogObserver(options.get('logfile')), ignoreClass=1) +builderService = service.IServiceCollection(application) +builder.builder.service = builderService + +root = resource.Resource() +root.putChild(b'rpc', builder) +root.putChild(b'filecache', static.File(conf.get('builder', 'filecache'))) +buildersite = server.Site(root) + +strports.service("tcp:%s" % builder.builder._config.get("builder", "bindport"), + buildersite).setServiceParent(builderService) + +# You can interact with a running builder like this: +# (assuming the builder is on localhost:8221) +# +# python3 +# from xmlrpc.client import ServerProxy +# s = ServerProxy("http://localhost:8221/rpc") +# s.echo("Hello World") diff -Nru launchpad-buildd-213~551~ubuntu18.04.1/lpbuildd/tests/harness.py launchpad-buildd-213~552~ubuntu18.04.1/lpbuildd/tests/harness.py --- launchpad-buildd-213~551~ubuntu18.04.1/lpbuildd/tests/harness.py 2022-04-20 20:01:52.000000000 +0000 +++ launchpad-buildd-213~552~ubuntu18.04.1/lpbuildd/tests/harness.py 2022-04-21 20:02:39.000000000 +0000 @@ -148,16 +148,16 @@ 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 -Nru launchpad-buildd-213~551~ubuntu18.04.1/MANIFEST.in launchpad-buildd-213~552~ubuntu18.04.1/MANIFEST.in --- launchpad-buildd-213~551~ubuntu18.04.1/MANIFEST.in 2022-04-20 20:01:52.000000000 +0000 +++ launchpad-buildd-213~552~ubuntu18.04.1/MANIFEST.in 2022-04-21 20:02:39.000000000 +0000 @@ -10,6 +10,6 @@ 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 -Nru launchpad-buildd-213~551~ubuntu18.04.1/template-buildd.conf launchpad-buildd-213~552~ubuntu18.04.1/template-buildd.conf --- launchpad-buildd-213~551~ubuntu18.04.1/template-buildd.conf 1970-01-01 00:00:00.000000000 +0000 +++ launchpad-buildd-213~552~ubuntu18.04.1/template-buildd.conf 2022-04-21 20:02:39.000000000 +0000 @@ -0,0 +1,15 @@ +# Launchpad Buildd configuration. +# +# Configuration for buildd: @NAME@ + +[builder] +architecturetag = @ARCHTAG@ +filecache = /home/buildd/filecache-@NAME@ +bindhost = @BINDHOST@ +bindport = @BINDPORT@ +ntphost = ntp.buildd +sharepath = /usr/share/launchpad-buildd +proxyport = @PROXYPORT@ + +[translationtemplatesmanager] +resultarchive = translation-templates.tar.gz diff -Nru launchpad-buildd-213~551~ubuntu18.04.1/template-buildd-slave.conf launchpad-buildd-213~552~ubuntu18.04.1/template-buildd-slave.conf --- launchpad-buildd-213~551~ubuntu18.04.1/template-buildd-slave.conf 2022-04-20 20:01:52.000000000 +0000 +++ launchpad-buildd-213~552~ubuntu18.04.1/template-buildd-slave.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -# Launchpad Buildd configuration. -# -# Configuration for buildd: @NAME@ - -[builder] -architecturetag = @ARCHTAG@ -filecache = /home/buildd/filecache-@NAME@ -bindhost = @BINDHOST@ -bindport = @BINDPORT@ -ntphost = ntp.buildd -sharepath = /usr/share/launchpad-buildd -proxyport = @PROXYPORT@ - -[translationtemplatesmanager] -resultarchive = translation-templates.tar.gz