[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 4 commits: Don't allocate a pty.

[Holger Levsen (@holger)]

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


Commits:
46e1c25b by Jelmer Vernooij at 2022-02-02T21:01:28+01:00
Don't allocate a pty.

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

- - - - -
0c0a5539 by Jelmer Vernooij at 2022-02-02T21:01:28+01:00
Add jenkins to the docker group.

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

- - - - -
a7aa7f4d by Jelmer Vernooij at 2022-02-02T21:01:28+01:00
Drop obsolete comment.

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

- - - - -
228a5261 by Jelmer Vernooij at 2022-02-02T21:01:28+01:00
Drop obsolete entries from sudoers.

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

- - - - -


4 changed files:

- bin/janitor_setup_worker.sh
- bin/janitor_worker.sh
- hosts/common/etc/sudoers.d/jenkins
- update_jdn.sh


Changes:

=====================================
bin/janitor_setup_worker.sh
=====================================
@@ -8,6 +8,7 @@ DEBUG=true
 . /srv/jenkins/bin/common-functions.sh
 common_init "$@"
 
+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
 
-docker run --rm -it \
+docker run --rm -i \
 	--memory=20g \
 	-v /srv/janitor:/srv/janitor \
 	eu.gcr.io/debian-janitor/worker \


=====================================
hosts/common/etc/sudoers.d/jenkins
=====================================
@@ -42,11 +42,11 @@ jenkins ALL=  \
 	/usr/bin/qemu-system-x86_64 *, \
 	/usr/bin/qemu-img *, \
 	/sbin/lvcreate *, /sbin/lvremove *, /sbin/lvdisplay *, \
-	/bin/mkdir -p /media/*, /bin/mkdir -p /srv/janitor/*, \
+	/bin/mkdir -p /media/*, \
 	/bin/mkdir -p /srv/fakeroot-foreign/*, /bin/chown -R jenkins\:jenkins /srv/fakeroot-foreign/*, \
 	/usr/bin/guestmount *, \
 	/bin/cp -rv /media/*, \
-	/bin/chown -R jenkins\:jenkins /var/lib/jenkins/jobs/*, /bin/chown jenkins\:jenkins /srv/janitor/*, \
+	/bin/chown -R jenkins\:jenkins /var/lib/jenkins/jobs/*, \
 	SETENV: NOPASSWD: /usr/sbin/pbuilder *, \
 	SETENV: NOPASSWD: /usr/bin/timeout -k ??.?h ??h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder *, \
 	SETENV: NOPASSWD: /usr/bin/timeout -k ??.?h ??h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder *, \


=====================================
update_jdn.sh
=====================================
@@ -405,7 +405,6 @@ if [ -f /etc/debian_version ] ; then
 				apache2" ;;
 			*) ;;
 		esac
-		# install lintian-brush dependencies for debian-janitor
 		case $HOSTNAME in
 			osuosl167*) DEBS="$DEBS
 				docker.io



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/23a9c5d92e5da0f6c1560b3cf4c8d120f1687111...228a5261daac17428c88bc775eb553e3d793f61e

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/23a9c5d92e5da0f6c1560b3cf4c8d120f1687111...228a5261daac17428c88bc775eb553e3d793f61e
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/20220202/e4fd9adc/attachment-0001.htm>