Use a custom sbuildrc for the jenkins worker that just uses a single

chroot.

This is easier than adding a mechanism to manipulate aliases for the
build chroot.

Signed-off-by: Holger Levsen <holger@layer-acht.org>

bin/janitor_setup_worker.sh

@@ -15,6 +15,10 @@ TARGET=/srv/janitor
 sudo mkdir -p $TARGET/
 sudo chown -R jenkins:jenkins $TARGET/
 
+ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
+DISTRO=unstable
+CHROOT=$DISTRO-$ARCH-sbuild
+
 if [ ! -d $TARGET/debian-janitor ]; then
 	git clone --recurse $JANITOR_REPO_URL $TARGET/debian-janitor
 else
@@ -30,14 +34,13 @@ fi
 make -C $TARGET/debian-janitor/breezy
 make -C $TARGET/debian-janitor/dulwich
 
-ARCH=amd64
-DISTRO=unstable
+sed -e 's/%r/unstable/' < $TARGET/debian-janitor/sbuildrc > $TARGET/sbuildrc
 
 mkdir -p $TARGET/chroots
 
 if [ -d $TARGET/chroots/janitor-$DISTRO-$ARCH ] ; then
 	echo "updating existing chroot for $DISTRO/$ARCH."
-	sudo sbuild-update -udcar unstable-amd64-sbuild
+	sudo sbuild-update -udcar $CHROOT
 else
 	echo "preparing chroot for $DISTRO/$ARCH."
 	sudo sbuild-createchroot $DISTRO $TARGET/chroots/janitor-$DISTRO-$ARCH http://deb.debian.org/debian

bin/janitor_worker.sh

@@ -6,7 +6,7 @@ WORKSPACE=/srv/janitor/debian-janitor
 
 export BRZ_PLUGINS_AT=debian@$WORKSPACE/breezy-debian
 export PYTHONPATH=$WORKSPACE:$WORKSPACE/breezy:$WORKSPACE/silver-platter:$WORKSPACE/lintian-brush:$WORKSPACE/dulwich:$WORKSPACE/python-debian/lib:$WORKSPACE/debmutate
-export SBUILD_CONFIG=$WORKSPACE/sbuildrc
+export SBUILD_CONFIG=/srv/janitor/sbuildrc
 export AUTOPKGTEST=$WORKSPACE/autopkgtest-wrapper
 python3 -m janitor.pull_worker \
     --base-url=https://janitor.debian.net/api/ \