[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: Install python3-semver for the janitor.

[Holger Levsen]

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


Commits:
a0a299b1 by Jelmer Vernooij at 2021-04-14T19:48:06+02:00
Install python3-semver for the janitor.

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

- - - - -
a1c30f40 by Jelmer Vernooij at 2021-04-14T19:48:06+02:00
Enable eatmydata on the janitor worker.

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

- - - - -


2 changed files:

- bin/janitor_setup_worker.sh
- update_jdn.sh


Changes:

=====================================
bin/janitor_setup_worker.sh
=====================================
@@ -35,7 +35,9 @@ fi
 make -C $TARGET/debian-janitor/breezy realclean all
 make -C $TARGET/debian-janitor/dulwich
 
-sed -e 's/%r/unstable/' < $TARGET/debian-janitor/sbuildrc > $TARGET/sbuildrc
+cp $TARGET/debian-janitor/sbuildrc $TARGET/sbuildrc
+sed -i "s/\$piuparts_opts = ['--schroot', '%r-%a-sbuild' ];/\$piuparts_opts = ['--schroot', '%r-%a-sbuild', '--no-eatmydata' ];/" $TARGET/sbuildrc
+sed -i 's/%r/unstable/' $TARGET/sbuildrc
 
 mkdir -p $TARGET/chroots
 
@@ -46,6 +48,7 @@ else
 	echo "preparing chroot for $DISTRO/$ARCH."
 	sudo sbuild-createchroot \
 	     --extra-repository="deb-src http://deb.debian.org/debian/ $DISTRO main" \
+	     --include=eatmydata \
 	     $DISTRO $TARGET/chroots/janitor-$DISTRO-$ARCH http://deb.debian.org/debian
 fi
 


=====================================
update_jdn.sh
=====================================
@@ -431,6 +431,7 @@ if [ -f /etc/debian_version ] ; then
 				python3-pyinotify
 				python3-requirement-parser
 				python3-ruamel.yaml
+				python3-semver
 				python3-setuptools
 				python3-six
 				python3-subunit



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/b6865d93cf68b0a986b5da3b5212ee9cc15a4481...a1c30f4069db321b9aeba77cb4173aea876dd1ec

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/b6865d93cf68b0a986b5da3b5212ee9cc15a4481...a1c30f4069db321b9aeba77cb4173aea876dd1ec
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/20210414/f6cfe6b7/attachment-0001.htm>