[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: Force fetch from the upstream janitor repository, rather than attempting to merge.

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
3139ae00 by Jelmer Vernooij at 2020-07-23T13:55:29+02:00
Force fetch from the upstream janitor repository, rather than attempting to merge.

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

- - - - -
86f03818 by Jelmer Vernooij at 2020-07-23T13:55:29+02:00
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 at layer-acht.org>

- - - - -


2 changed files:

- bin/janitor_setup_worker.sh
- bin/janitor_worker.sh


Changes:

=====================================
bin/janitor_setup_worker.sh
=====================================
@@ -15,28 +15,32 @@ 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
 	pushd $TARGET/debian-janitor
-	git reset --hard
 	git status || /bin/true
+	git fetch
+	git reset --hard HEAD
+	git merge origin/master
 	git submodule update --init
-	git pull --recurse
 	popd
 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/ \



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/89b777763f81273afa696d9f5864f2b122cf36ed...86f03818e1f77b2cecfb08c746522073e22af5e7

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/89b777763f81273afa696d9f5864f2b122cf36ed...86f03818e1f77b2cecfb08c746522073e22af5e7
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20200723/10bf6db3/attachment-0001.html>