[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 4 commits: Allow concurrent builds, but limit to 4.

[Holger Levsen]

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


Commits:
be8656c7 by Jelmer Vernooij at 2020-06-01T14:02:11+02:00
Allow concurrent builds, but limit to 4.

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

- - - - -
6c92d934 by Jelmer Vernooij at 2020-06-01T14:02:23+02:00
Fix chroot name.

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

- - - - -
00a1bf67 by Jelmer Vernooij at 2020-06-01T14:02:34+02:00
Allow jenkins to run sbuild.

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

- - - - -
96b5e3cc by Jelmer Vernooij at 2020-06-01T14:02:43+02:00
Add missing dependencies on quilt and python3-yaml, needed for some changes.

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

- - - - -


3 changed files:

- bin/janitor_worker.sh
- job-cfg/janitor.yaml
- update_jdn.sh


Changes:

=====================================
bin/janitor_worker.sh
=====================================
@@ -10,5 +10,5 @@ export SBUILD_CONFIG=$WORKSPACE/sbuildrc
 export AUTOPKGTEST=$WORKSPACE/autopkgtest-wrapper
 python3 -m janitor.pull_worker \
     --base-url=https://janitor.debian.net/api/ \
-    --build-command="sbuild -A -v -c jenkins-unstable-amd64" \
+    --build-command="sbuild -A -v -c unstable-amd64-sbuild" \
     --credentials=/srv/janitor/janitor.creds.json


=====================================
job-cfg/janitor.yaml
=====================================
@@ -47,9 +47,13 @@
 - job:
     defaults: janitor
     name: janitor-worker
+    concurrent: true
     description: 'Run the janitor worker'
     triggers:
-      - timed: 'H * * * *'
+      - timed: 'H H/5 * * *'
+    properties:
+      - throttle:
+         max-per-node: 4
 
 - project:
     name: janitor


=====================================
update_jdn.sh
=====================================
@@ -164,7 +164,7 @@ done
 
 # configure sbuild:
 case $HOSTNAME in
-	profitbricks-build7-a*) sudo sbuild-adduser jenkins ;;
+	profitbricks-build7-a*|osuosl-build167*) sudo sbuild-adduser jenkins ;;
 	*) ;;
 esac
 
@@ -371,6 +371,7 @@ if [ -f /etc/debian_version ] ; then
 				python3-subunit
 				python3-testtools
 				python3-urllib3
+				python3-yaml
 				sbuild
 				gnome-pkg-tools
 				postgresql-server-dev-all
@@ -378,6 +379,7 @@ if [ -f /etc/debian_version ] ; then
 				dos2unix
 				gpg
 				libdebhelper-perl
+				quilt
 				" ;;
 				# python3-asyncpg is not available on buster
 		esac



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/2fec70de826807061d5cf55f1d9e48cf52501e93...96b5e3cc8e11e385245e77e45e4cdbeeb3d1d50a

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/2fec70de826807061d5cf55f1d9e48cf52501e93...96b5e3cc8e11e385245e77e45e4cdbeeb3d1d50a
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/20200601/84617168/attachment-0001.html>