[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 3 commits: Add support for reading janitor credentials from a local file.

[Holger Levsen]

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


Commits:
ca7847fd by Jelmer Vernooij at 2020-05-17T17:27:27+02:00
Add support for reading janitor credentials from a local file.
- - - - -
ea157858 by Jelmer Vernooij at 2020-05-17T17:27:36+02:00
Avoid a duplicate clone of the repository.
- - - - -
cdcb59f4 by Jelmer Vernooij at 2020-05-17T17:27:51+02:00
Use modern directive for enabling submodules.
- - - - -


3 changed files:

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


Changes:

=====================================
bin/janitor_setup_worker.sh
=====================================
@@ -30,9 +30,6 @@ make -C $TARGET/debian-janitor/dulwich
 ARCH=amd64
 DISTRO=unstable
 
-# TODO(jelmer): Do we actually need a checkout of the repo?
-git clone --recurse-submodules ${JANITOR_REPO_URL} debian-janitor
-
 if [ ! -d $TARGET/chroots ]; then
 	mkdir $TARGET/chroots
 fi


=====================================
bin/janitor_worker.sh
=====================================
@@ -7,5 +7,4 @@ WORKSPACE=/srv/janitor/debian-janitor
 export PYTHONPATH=$WORKSPACE:$WORKSPACE/breezy:$WORKSPACE/silver-platter:$WORKSPACE/lintian-brush:$WORKSPACE/dulwich
 export SBUILD_CONFIG=$WORKSPACE/sbuildrc
 export AUTOPKGTEST=$WORKSPACE/autopkgtest-wrapper
-# TODO(jelmer): Set $API_USERNAME / $API_PASSWORD somewhere
-python3 -m janitor.pull_worker --base-url=https://$API_USERNAME:$API_PASSWORD@janitor.debian.net/api/ --build-command="sbuild -A -v -c jenkins-unstable-amd64"
+python3 -m janitor.pull_worker --base-url=https://janitor.debian.net/api/ --build-command="sbuild -A -v -c jenkins-unstable-amd64" --credentials=/srv/janitor/janitor.creds.json


=====================================
job-cfg/janitor.yaml
=====================================
@@ -36,7 +36,8 @@
           url: 'https://salsa.debian.org/jelmer/debian-janitor'
           branches:
             - master
-          recursive-submodules: true
+          submodule:
+            recursive: yes
     triggers:
       - pollscm:
           cron: 'H/1 H/1 * * *'



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/485c7ebc8df260b872d053cbdeac3be6c55493e9...cdcb59f4ab8645a99bc88ef9f27ce22974c01642

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/485c7ebc8df260b872d053cbdeac3be6c55493e9...cdcb59f4ab8645a99bc88ef9f27ce22974c01642
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/20200517/093ab113/attachment-0001.html>