[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: Revert "janitor: run worker less often"

[Holger Levsen]

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


Commits:
ca5bd54f by Jelmer Vernooij at 2020-06-22T17:19:04+02:00
Revert "janitor: run worker less often"

The issue that prevented git fetches from the janitor cache has been
fixed, which means that most runs should now succeed.

This reverts commit 732c93b51945526b5acbbea85bfd77a8d5024e52.

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

- - - - -
dda91da2 by Jelmer Vernooij at 2020-06-22T17:19:04+02:00
janitor: Use private copy of python-debian.

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

- - - - -


3 changed files:

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


Changes:

=====================================
bin/janitor_setup_worker.sh
=====================================
@@ -19,6 +19,7 @@ if [ ! -d $TARGET/debian-janitor ]; then
 	git clone --recurse $JANITOR_REPO_URL $TARGET/debian-janitor
 else
 	pushd $TARGET/debian-janitor
+	git submodule update --init
 	git pull --recurse
 	popd
 fi


=====================================
bin/janitor_worker.sh
=====================================
@@ -5,7 +5,7 @@ set -e
 WORKSPACE=/srv/janitor/debian-janitor
 
 export BRZ_PLUGINS_AT=debian@$WORKSPACE/breezy-debian
-export PYTHONPATH=$WORKSPACE:$WORKSPACE/breezy:$WORKSPACE/silver-platter:$WORKSPACE/lintian-brush:$WORKSPACE/dulwich
+export PYTHONPATH=$WORKSPACE:$WORKSPACE/breezy:$WORKSPACE/silver-platter:$WORKSPACE/lintian-brush:$WORKSPACE/dulwich:$WORKSPACE/python-debian/lib
 export SBUILD_CONFIG=$WORKSPACE/sbuildrc
 export AUTOPKGTEST=$WORKSPACE/autopkgtest-wrapper
 python3 -m janitor.pull_worker \


=====================================
job-cfg/janitor.yaml
=====================================
@@ -50,7 +50,7 @@
     concurrent: true
     description: 'Run the janitor worker'
     triggers:
-      - timed: 'H/60 H/24 * * *'
+      - timed: 'H/12 H/5 * * *'
     properties:
       - throttle:
          max-total: 4



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

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/a01e745c56c192fead5c5e255781313b5349c9ca...dda91da264f3fa1f8aba2b1cc863ffa68c619a7e
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/20200622/48f1b2e6/attachment-0001.html>