[Git][qa/jenkins.debian.net][master] amd64.r.d.n: move to /srv/rebuiderd/$arch just like i386

Holger Levsen (@holger) gitlab at salsa.debian.org
Tue Jan 21 17:32:20 GMT 2025



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


Commits:
542af5b5 by Holger Levsen at 2025-01-21T18:32:07+01:00
amd64.r.d.n: move to /srv/rebuiderd/$arch just like i386

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

- - - - -


6 changed files:

- bin/rebuilderd_graph.sh
- hosts/osuosl5-amd64/etc/cron.d/rebuilderd
- hosts/osuosl5-amd64/etc/nginx/nginx.conf
- hosts/osuosl5-amd64/opt/etc/rebuilderd.conf → hosts/osuosl5-amd64/opt/etc/rebuilderd-amd64.conf
- hosts/osuosl5-amd64/opt/etc/rebuilderd-sync.conf → hosts/osuosl5-amd64/opt/etc/rebuilderd-sync-amd64.conf
- hosts/osuosl5-amd64/opt/etc/rebuilderd-sync.i386.conf → hosts/osuosl5-amd64/opt/etc/rebuilderd-sync-i386.conf


Changes:

=====================================
bin/rebuilderd_graph.sh
=====================================
@@ -14,9 +14,9 @@ if [ -z "$1" ] ; then
 fi
 
 ARCH=$1
-DB=/srv/rebuilderd/rebuilderd.db
-CSV=/srv/rebuilderd/stats/rebuilderd.csv
-PNG=/srv/rebuilderd/stats/rb.png
+DB=/srv/rebuilderd/$ARCH/rebuilderd.db
+CSV=/srv/rebuilderd/$ARCH/stats/rebuilderd.csv
+PNG=/srv/rebuilderd/$ARCH/stats/rb.png
 TODAY=$(date '+%Y-%m-%d' -u)
 DUMMY_FILE=$(mktemp -t rebuilderd-graph-XXXXXXXX)
 touch -d "$(date '+%Y-%m-%d') 00:00 UTC" $DUMMY_FILE


=====================================
hosts/osuosl5-amd64/etc/cron.d/rebuilderd
=====================================
@@ -1,4 +1,3 @@
 MAILTO=root
-42 */3 * * * rebuilderd mkdir -p /srv/rebuilderd/stats/ && /srv/jenkins/bin/rebuilderd_stats.py amd64 /srv/rebuilderd/rebuilderd.db > /srv/rebuilderd/stats/index.html.tmp && mv /srv/rebuilderd/stats/index.html.tmp /srv/rebuilderd/stats/index.html
-#42 */3 * * * for arch in amd64 i386 ; do rebuilderd mkdir -p /srv/rebuilderd/$arch/stats/ && /srv/jenkins/bin/rebuilderd_stats.py $arch /srv/rebuilderd/$arch/rebuilderd.db > /srv/rebuilderd/$arch/stats/index.html.tmp && mv /srv/rebuilderd/$arch/stats/index.html.tmp /srv/rebuilderd/$arch/stats/index.html ; done
-23 0,6,12,18 * * * for arch in amd64 ; do rebuilderd /srv/jenkins/bin/rebuilderd_graph.sh $arch ; done
+42 */3 * * * for arch in amd64 i386 ; do rebuilderd mkdir -p /srv/rebuilderd/$arch/stats/ && /srv/jenkins/bin/rebuilderd_stats.py $arch /srv/rebuilderd/$arch/rebuilderd.db > /srv/rebuilderd/$arch/stats/index.html.tmp && mv /srv/rebuilderd/$arch/stats/index.html.tmp /srv/rebuilderd/$arch/stats/index.html ; done
+23 0,6,12,18 * * * for arch in amd64 i386 ; do rebuilderd /srv/jenkins/bin/rebuilderd_graph.sh $arch ; done


=====================================
hosts/osuosl5-amd64/etc/nginx/nginx.conf
=====================================
@@ -53,7 +53,7 @@ http {
         }
 
 	location /stats/ {
-            alias /srv/rebuilderd/stats/ ;
+            alias /srv/rebuilderd/amd64/stats/ ;
             disable_symlinks off;
             autoindex on;
             index index.html;


=====================================
hosts/osuosl5-amd64/opt/etc/rebuilderd.conf → hosts/osuosl5-amd64/opt/etc/rebuilderd-amd64.conf
=====================================


=====================================
hosts/osuosl5-amd64/opt/etc/rebuilderd-sync.conf → hosts/osuosl5-amd64/opt/etc/rebuilderd-sync-amd64.conf
=====================================


=====================================
hosts/osuosl5-amd64/opt/etc/rebuilderd-sync.i386.conf → hosts/osuosl5-amd64/opt/etc/rebuilderd-sync-i386.conf
=====================================



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/542af5b52e6530d9619290620bef3b787ae61cce

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/542af5b52e6530d9619290620bef3b787ae61cce
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/20250121/dd85d57a/attachment-0001.htm>


More information about the Qa-jenkins-scm mailing list