[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 3 commits: Regularly pull the janitor worker docker image.

[Holger Levsen (@holger)]

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


Commits:
a1f9fe3a by Jelmer Vernooij at 2022-04-19T17:06:02+02:00
Regularly pull the janitor worker docker image.

Previously this was triggered by changes to the SCM, but that leaves
room for race conditions and the repo URL was out of date.

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

- - - - -
c0c7ec69 by Jelmer Vernooij at 2022-04-19T17:07:16+02:00
Copy output to standard out.

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

- - - - -
60849ab1 by Paul Spooren at 2022-04-19T17:09:30+02:00
OpenWrt: update docs to inlcude disorderfs usage

Update overview table and TODO

Signed-off-by: Paul Spooren <mail at aparcar.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


4 changed files:

- TODO
- bin/janitor_worker.sh
- bin/reproducible_common.sh
- job-cfg/janitor.yaml


Changes:

=====================================
TODO
=====================================
@@ -247,7 +247,6 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
 * add credit for logo/artwork
 * explain status in plain english
 * build path variation
-* use disorderfs for 2nd build
 * incorporate popular third-party ("external feeds") packages?
 * html: build variations are wrong
 * html: git commit output includes garbage


=====================================
bin/janitor_worker.sh
=====================================
@@ -11,4 +11,5 @@ docker run --rm --cap-add=SYS_ADMIN --privileged \
 	--listen-address=0.0.0.0 \
 	--port=8080 \
 	--base-url=https://janitor.debian.net/api/ \
-	--credentials=/srv/janitor/credentials.json
+	--credentials=/srv/janitor/credentials.json \
+	--tee


=====================================
bin/reproducible_common.sh
=====================================
@@ -577,16 +577,23 @@ write_variation_table() {
 	if [ "$1" != "FreeBSD" ] ; then
 		if [ "$1" = "debian" ] ; then
 			write_page "<tr><td>hour, minute</td><td>at least the minute will probably vary between two builds anyway...</td><td>on amd64, i386 and arm64 the \"future builds\" additionally run 6h and 23min ahead</td></tr>"
-		        write_page "<tr><td>filesystem</td><td>tmpfs</td><td><em>temporarily not</em> varied using <a href=\"https://tracker.debian.org/disorderfs\">disorderfs</a> (<a href=\"https://sources.debian.org/src/disorderfs/sid/disorderfs.1.txt/\">manpage</a>)</td></tr>"
 		else
 			write_page "<tr><td>hour, minute</td><td>hour and minute will probably vary between two builds...</td><td>the future system actually runs 398 days, 6 hours and 23 minutes ahead...</td></tr>"
-			write_page "<tr><td>Filesystem</td><td>tmpfs</td><td>same for both builds (currently, this could be varied using <a href=\"https://tracker.debian.org/disorderfs\">disorderfs</a>)</td></tr>"
 		fi
 	else
 		write_page "<tr><td>year, month, date</td><td>today ($TODAY)</td><td>the 2nd build is done with the build node set 1 year, 1 month and 1 day in the future</td></tr>"
 		write_page "<tr><td>hour, minute</td><td>hour and minute will vary between two builds</td><td>additionally the \"future build\" also runs 6h and 23min ahead</td></tr>"
 		write_page "<tr><td>filesystem of the build directory</td><td>ufs</td><td>same for both builds</td></tr>"
 	fi
+	if [ "$1" != "OpenWrt" ]; then
+		if [ "$1" = "debian" ] ; then
+			write_page "<tr><td>filesystem</td><td>tmpfs</td><td><em>temporarily not</em> varied using <a href=\"https://tracker.debian.org/disorderfs\">disorderfs</a> (<a href=\"https://sources.debian.org/src/disorderfs/sid/disorderfs.1.txt/\">manpage</a>)</td></tr>"
+		else
+			write_page "<tr><td>Filesystem</td><td>tmpfs</td><td>same for both builds (currently, this could be varied using <a href=\"https://tracker.debian.org/disorderfs\">disorderfs</a>)</td></tr>"
+		fi
+	else
+		write_page "<tr><td>Filesystem</td><td>tmpfs</td><td><a href=\"https://tracker.debian.org/disorderfs\">disorderfs</a></td></tr>"
+	fi
 	if [ "$1" = "debian" ] ; then
 		write_page "<tr><td><em>everything else...</em></td><td colspan=\"2\">is likely the same. So far, this is just about the <em>potential</em> of <a href=\"https://wiki.debian.org/ReproducibleBuilds\">reproducible builds of Debian</a> - there will be more variations in the wild.</td></tr>"
 	else


=====================================
job-cfg/janitor.yaml
=====================================
@@ -28,18 +28,9 @@
 - job:
     defaults: janitor
     name: janitor-setup-worker
-    description: 'Rebuild the janitor worker whenever the repository changes.'
-    scm:
-      - git:
-          url: 'https://salsa.debian.org/jelmer/debian-janitor'
-          branches:
-            - master
-          submodule:
-            recursive: yes
+    description: 'Regularly update the docker worker image for the Debian Janitor'
     triggers:
-      - pollscm:
-          cron: 'H/15 * * * *'
-      - timed: '@monthly'
+      - timed: 'H/15 * * * *'
     block-downstream: yes
 
 - job:



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/aebf8e77bfc433f52c9cf219c6d29b4a49ef1089...60849ab1332df47bc6c06657d5303afdd588f493

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/aebf8e77bfc433f52c9cf219c6d29b4a49ef1089...60849ab1332df47bc6c06657d5303afdd588f493
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/20220419/3aa8fa88/attachment-0001.htm>