[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] Revert "janitor: Use podman to run worker container."

[Holger Levsen (@holger)]

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


Commits:
44a8326e by Jelmer Vernooij at 2022-09-07T10:12:04+02:00
Revert "janitor: Use podman to run worker container."

schroot inside podman doesn't work well enough; hopefully we can revert
the revert later..

This reverts commit 6f620c22843983229f34b601895a667a762afbb2.

Signed-off-by: Jelmer Vernooij <jelmer at jelmer.uk>
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
=====================================
@@ -8,6 +8,7 @@ DEBUG=true
 . /srv/jenkins/bin/common-functions.sh
 common_init "$@"
 
-sudo sysctl kernel.unprivileged_userns_clone=1
+sudo adduser jenkins docker
+docker pull eu.gcr.io/debian-janitor/worker
 
 # vim: set sw=0 noet :


=====================================
bin/janitor_worker.sh
=====================================
@@ -2,7 +2,7 @@
 
 set -e
 
-podman run --pull always --rm --cap-add=SYS_ADMIN --privileged \
+docker run --rm --cap-add=SYS_ADMIN --privileged \
 	--memory=20g \
 	-v /srv/janitor:/srv/janitor \
 	-e BUILD_URL="${BUILD_URL}" \


=====================================
update_jdn.sh
=====================================
@@ -413,7 +413,7 @@ if [ -f /etc/debian_version ] ; then
 		esac
 		case $HOSTNAME in
 			osuosl167*) DEBS="$DEBS
-				podman
+				docker.io
 				" ;;
 		esac
 		# notifications are only done from a few nodes



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/44a8326e1dbc45b42c0ec30085edb2cc065750d6

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/44a8326e1dbc45b42c0ec30085edb2cc065750d6
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/20220907/58bf6cbf/attachment-0001.htm>