[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible Debian: support apache redirects for bookworm

[Holger Levsen (@holger)]

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


Commits:
2a9ea663 by Holger Levsen at 2021-08-17T11:22:33+02:00
reproducible Debian: support apache redirects for bookworm

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

- - - - -
7c52597c by Holger Levsen at 2021-08-17T11:26:17+02:00
reproducible Debian: stop linking outdated documentation

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

- - - - -


2 changed files:

- hosts/jenkins/etc/apache2/reproduciblemap.conf
- job-cfg/reproducible.yaml


Changes:

=====================================
hosts/jenkins/etc/apache2/reproduciblemap.conf
=====================================
@@ -99,11 +99,11 @@ RewriteRule ^/debian/testing/(.*) /debian/bullseye/$1
 
 # redirect /$suite to /$suite/index_suite_amd64_stats.html
 # note: the missing slash in the RewriteRule is wanted to avoid a double slash
-RewriteCond %{REQUEST_URI} ^/(debian/|)(stretch|buster|bullseye|unstable|experimental)(/|)$
+RewriteCond %{REQUEST_URI} ^/(debian/|)(stretch|buster|bullseye|bookworm|unstable|experimental)(/|)$
 RewriteRule ^/(debian/|)(.*) /debian/$2/index_suite_amd64_stats.html [R,L]
 
 # redirect /$suite/$arch to $suite/index_suite_$arch_stats.html
-RewriteCond %{REQUEST_URI} ^/(debian/|)(stretch|buster|bullseye|unstable|experimental)/(amd64|arm64|armhf|i386)(/|)$
+RewriteCond %{REQUEST_URI} ^/(debian/|)(stretch|buster|bullseye|bookworm|unstable|experimental)/(amd64|arm64|armhf|i386)(/|)$
 RewriteRule ^/(debian/|)([a-z0-9]+)/([a-z0-9]+) /debian/$2/index_suite_$3_stats.html [R,L]
 
 # redirect /$arch to /unstable/index_suite_$arch_stats.html


=====================================
job-cfg/reproducible.yaml
=====================================
@@ -400,22 +400,22 @@
         - '{name}_{my_task}_{my_arch}_{my_hname}':
             my_task:
                 - 'setup_pbuilder_stretch':
-                    my_description: 'Setup pbuilder for reproducible builds of packages from stretch as described in https://wiki.debian.org/ReproducibleBuilds#Usage_example'
+                    my_description: 'Setup pbuilder for reproducible builds of packages from stretch'
                     my_timed: '23 7 1 * *'
                 - 'setup_pbuilder_buster':
-                    my_description: 'Setup pbuilder for reproducible builds of packages from buster as described in https://wiki.debian.org/ReproducibleBuilds#Usage_example'
+                    my_description: 'Setup pbuilder for reproducible builds of packages from buster'
                     my_timed: '23 8 7 * *'
                 - 'setup_pbuilder_bullseye':
-                    my_description: 'Setup pbuilder for reproducible builds of packages from bullseye as described in https://wiki.debian.org/ReproducibleBuilds#Usage_example'
+                    my_description: 'Setup pbuilder for reproducible builds of packages from bullseye'
                     my_timed: '23 9 7,21 * *'
                 - 'setup_pbuilder_bookworm':
-                    my_description: 'Setup pbuilder for reproducible builds of packages from bookworm as described in https://wiki.debian.org/ReproducibleBuilds#Usage_example'
+                    my_description: 'Setup pbuilder for reproducible builds of packages from bookworm'
                     my_timed: '23 10 H/2 * *'
                 - 'setup_pbuilder_unstable':
-                    my_description: 'Setup pbuilder for reproducible builds of packages from unstable as described in https://wiki.debian.org/ReproducibleBuilds#Usage_example'
+                    my_description: 'Setup pbuilder for reproducible builds of packages from unstable'
                     my_timed: '42 7 H/2 * *'
                 - 'setup_pbuilder_experimental':
-                    my_description: 'Setup pbuilder for reproducible builds of packages from experimental as described in https://wiki.debian.org/ReproducibleBuilds#Usage_example'
+                    my_description: 'Setup pbuilder for reproducible builds of packages from experimental'
                     my_timed: '33 7 H/3 * *'
             my_hname:
                 - 'cbxi4a':         { my_arch: 'armhf' }



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/4a114b33fa91272e8362af1cc20252f0cc9898ab...7c52597c5f99e3014024d6328159e80f956ca69c

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/4a114b33fa91272e8362af1cc20252f0cc9898ab...7c52597c5f99e3014024d6328159e80f956ca69c
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/20210817/01fe12ff/attachment-0001.htm>