[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 4 commits: Install python3-prometheus-client for janitor.

[Holger Levsen (@holger)]

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


Commits:
7d1f63d2 by Jelmer Vernooij at 2021-05-31T13:38:28+02:00
Install python3-prometheus-client for janitor.

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

- - - - -
aee11895 by Jelmer Vernooij at 2021-05-31T13:38:33+02:00
Install python3-jinja2 for the janitor.

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

- - - - -
25d514f6 by Jelmer Vernooij at 2021-05-31T13:38:39+02:00
Fix sed expression in janitor setup.

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

- - - - -
17f180cb by Jelmer Vernooij at 2021-05-31T13:38:45+02:00
Move janitor temporary directory to /srv/janitor/tmp.

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

- - - - -


3 changed files:

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


Changes:

=====================================
bin/janitor_setup_worker.sh
=====================================
@@ -32,11 +32,14 @@ else
 	popd
 fi
 
+mkdir -p $TARGET/tmp
+sudo chown jenkins:jenkins $TARGET/tmp
+
 make -C $TARGET/debian-janitor/breezy realclean all
 make -C $TARGET/debian-janitor/dulwich
 
 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/\$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


=====================================
bin/janitor_worker.sh
=====================================
@@ -6,6 +6,8 @@ WORKSPACE=/srv/janitor/debian-janitor
 
 export SBUILD_CONFIG=/srv/janitor/sbuildrc
 
+export TMPDIR=/srv/janitor/tmp
+
 $WORKSPACE/pull_worker.sh \
     --base-url=https://janitor.debian.net/api/ \
     --credentials=/srv/janitor/janitor.creds.json


=====================================
update_jdn.sh
=====================================
@@ -427,6 +427,7 @@ if [ -f /etc/debian_version ] ; then
 				python3-distro-info
 				python3-fastimport
 				python3-iniparse
+				python3-jinja2
 				python3-launchpadlib
 				python3-levenshtein
 				python3-lz4
@@ -435,6 +436,7 @@ if [ -f /etc/debian_version ] ; then
 				python3-paramiko
 				python3-patiencediff
 				python3-pkginfo
+				python3-prometheus-client
 				python3-pyinotify
 				python3-requirement-parser
 				python3-ruamel.yaml



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/c5b6a545658e740d6bde962d22974ed77c97f93a...17f180cb92122e1c6e137fc1c4a19ceb58e1ec71

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/c5b6a545658e740d6bde962d22974ed77c97f93a...17f180cb92122e1c6e137fc1c4a19ceb58e1ec71
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/20210531/461e1621/attachment-0001.htm>