[Qa-jenkins-scm] [jenkins.debian.net] 01/02: reproducible debian: create subdirectory tests.r-b.org/debian
Holger Levsen
holger at layer-acht.org
Wed Jun 8 14:14:19 UTC 2016
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch master
in repository jenkins.debian.net.
commit 1d2518fbda03f4117fb0344da3197b16f7e8574f
Author: Valerie R Young <spectranaut at riseup.net>
Date: Tue Jun 7 13:40:01 2016 -0400
reproducible debian: create subdirectory tests.r-b.org/debian
---
bin/reproducible_common.py | 2 +-
bin/reproducible_common.sh | 2 +-
.../sites-available/jenkins.debian.net.conf | 62 +++++++++++-----------
3 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py
index e064e5c..e2e90f0 100755
--- a/bin/reproducible_common.py
+++ b/bin/reproducible_common.py
@@ -42,7 +42,7 @@ defaultsuite = 'unstable'
defaultarch = 'amd64'
BIN_PATH = '/srv/jenkins/bin'
-BASE = '/var/lib/jenkins/userContent/reproducible'
+BASE = '/var/lib/jenkins/userContent/reproducible/debian'
REPRODUCIBLE_JSON = BASE + '/reproducible.json'
REPRODUCIBLE_TRACKER_JSON = BASE + '/reproducible-tracker.json'
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index ed09ba6..c2d0f23 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -70,7 +70,7 @@ NUM_CPU=$(grep -c '^processor' /proc/cpuinfo)
# we only this array for html creation but we cannot declare them in a function
declare -A SPOKENTARGET
-BASE="/var/lib/jenkins/userContent/reproducible"
+BASE="/var/lib/jenkins/userContent/reproducible/debian"
mkdir -p "$BASE"
# to hold reproducible temporary files/directories without polluting /tmp
diff --git a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
index 8bbbb9b..79bdb47 100644
--- a/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
+++ b/hosts/jenkins/etc/apache2/sites-available/jenkins.debian.net.conf
@@ -142,7 +142,7 @@ Use common-debian-service-https-redirect reproducible-builds.org
RewriteCond %{REQUEST_URI} ^/userContent/notes/ [or]
RewriteCond %{REQUEST_URI} ^/userContent/artifacts/ [or]
RewriteCond %{REQUEST_URI} ^/userContent/rbuild/
- RewriteRule ^/?(.*) https://reproducible.debian.net/$1 [R=301,L]
+ RewriteRule ^/?(.*) https://reproducible.debian.net/debian/$1 [R=301,L]
<Proxy *>
Require all granted
@@ -179,7 +179,7 @@ Use common-debian-service-https-redirect reproducible-builds.org
# use reproducible.html as "home page"
RewriteCond %{HTTP_HOST} reproducible\.debian\.net
RewriteCond %{REQUEST_URI} ^/$
- RewriteRule ^/(.*) https://tests.reproducible-builds.org/reproducible.html [R,L]
+ RewriteRule ^/(.*) https://tests.reproducible-builds.org/debian/reproducible.html [R,L]
# drop the (old|ugly) /userContent/ directory from the url
RewriteCond %{HTTP_HOST} reproducible\.debian\.net
@@ -188,76 +188,76 @@ Use common-debian-service-https-redirect reproducible-builds.org
RewriteCond %{REQUEST_URI} ^/userContent
RewriteRule ^/userContent/(.*)$ https://tests.reproducible-builds.org/$1 [R=301,L]
- # redirect rb.d.n/issues/$ISSUE → rb.d.n/issues/unstable/$ISSUE
+ # redirect rb.d.n/issues/$ISSUE → rb.d.n/debian/issues/unstable/$ISSUE
RewriteCond %{HTTP_HOST} reproducible\.debian\.net
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
- RewriteCond /var/lib/jenkins/userContent/reproducible/issues/unstable/$1 -f
- RewriteRule ^/issues/([a-z0-9.+-_]+) https://tests.reproducible-builds.org/issues/unstable/$1 [R=302,L]
+ RewriteCond /var/lib/jenkins/userContent/reproducible/debian/issues/unstable/$1 -f
+ RewriteRule ^/issues/([a-z0-9.+-_]+) https://tests.reproducible-builds.org/debian/issues/unstable/$1 [R=302,L]
- # redirect rb.d.n/$PKG → rb.d.n/rb-pkg/unstable/amd64/$PKG.html
+ # redirect rb.d.n/$PKG → rb.d.n/debian/rb-pkg/unstable/amd64/$PKG.html
RewriteCond %{HTTP_HOST} reproducible\.debian\.net
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
- RewriteCond /var/lib/jenkins/userContent/reproducible/rb-pkg/unstable/amd64/$1.html -f
- RewriteRule ^/([a-z0-9.+-]+) https://tests.reproducible-builds.org/rb-pkg/unstable/amd64/$1.html [R=302,L]
+ RewriteCond /var/lib/jenkins/userContent/reproducible/debian/rb-pkg/unstable/amd64/$1.html -f
+ RewriteRule ^/([a-z0-9.+-]+) https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/$1.html [R=302,L]
# redirect rb.d.n/redirect/?SrcPkg=$PKG → rb.d.n/rb-pkg/unstable/amd64/$PKG.html
RewriteCond %{HTTP_HOST} reproducible\.debian\.net
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{QUERY_STRING} ^(\w+)=([a-z0-9.+-]+)$
- RewriteCond /var/lib/jenkins/userContent/reproducible/rb-pkg/unstable/amd64/%2.html -f
- RewriteRule ^/redirect https://tests.reproducible-builds.org/rb-pkg/unstable/amd64/%2.html? [R=302,L]
+ RewriteCond /var/lib/jenkins/userContent/reproducible/debian/rb-pkg/unstable/amd64/%2.html -f
+ RewriteRule ^/redirect https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/%2.html? [R=302,L]
# the following two rules are fallbacks for the previous two redirects and should only catch packages which are only in experimental
- # redirect rb.d.n/$PKG → rb.d.n/rb-pkg/experimental/amd64/$PKG.html
+ # redirect rb.d.n/$PKG → rb.d.n/debian/rb-pkg/experimental/amd64/$PKG.html
RewriteCond %{HTTP_HOST} reproducible\.debian\.net
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
- RewriteCond /var/lib/jenkins/userContent/reproducible/rb-pkg/experimental/amd64/$1.html -f
- RewriteRule ^/([a-z0-9.+-]+) https://tests.reproducible-builds.org/rb-pkg/experimental/amd64/$1.html [R=302,L]
+ RewriteCond /var/lib/jenkins/userContent/reproducible/debian/rb-pkg/experimental/amd64/$1.html -f
+ RewriteRule ^/([a-z0-9.+-]+) https://tests.reproducible-builds.org/debian/rb-pkg/experimental/amd64/$1.html [R=302,L]
- # redirect rb.d.n/redirect/?SrcPkg=$PKG → rb.d.n/rb-pkg/experimental/amd64/$PKG.html
+ # redirect rb.d.n/redirect/?SrcPkg=$PKG → rb.d.n/debian/rb-pkg/experimental/amd64/$PKG.html
RewriteCond %{HTTP_HOST} reproducible\.debian\.net
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{QUERY_STRING} ^(\w+)=([a-z0-9.+-]+)$
- RewriteCond /var/lib/jenkins/userContent/reproducible/rb-pkg/experimental/amd64/%2.html -f
- RewriteRule ^/redirect https://tests.reproducible-builds.org/rb-pkg/experimental/amd64/%2.html? [R=302,L]
+ RewriteCond /var/lib/jenkins/userContent/reproducible/debian/rb-pkg/experimental/amd64/%2.html -f
+ RewriteRule ^/redirect https://tests.reproducible-builds.org/debian/rb-pkg/experimental/amd64/%2.html? [R=302,L]
# redirect rb.d.n/$suite/(amd64|armhf|i386)/$PKG → rb.d.n/rb-pkg/$suite/$arch/$PKG.html
RewriteCond %{HTTP_HOST} reproducible\.debian\.net
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
- RewriteCond /var/lib/jenkins/userContent/reproducible/rb-pkg/$1/$2/$3.html -f
- RewriteRule ^/(unstable|testing|experimental)/([a-z0-9]+)/([a-z0-9.+-]+) https://tests.reproducible-builds.org/rb-pkg/$1/$2/$3.html [R=302,L]
+ RewriteCond /var/lib/jenkins/userContent/reproducible/debian/rb-pkg/$1/$2/$3.html -f
+ RewriteRule ^/(unstable|testing|experimental)/([a-z0-9]+)/([a-z0-9.+-]+) https://tests.reproducible-builds.org/debian/rb-pkg/$1/$2/$3.html [R=302,L]
- # redirect rb.d.n/rb-pkg/$PKG.html → rb.d.n/rb-pkg/unstable/amd64/$PKG.html
+ # redirect rb.d.n/rb-pkg/$PKG.html → rb.d.n/debian/rb-pkg/unstable/amd64/$PKG.html
RewriteCond %{HTTP_HOST} reproducible\.debian\.net
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
- RewriteCond /var/lib/jenkins/userContent/reproducible/rb-pkg/unstable/amd64/$1 -f
- RewriteRule ^/rb-pkg/([a-z0-9.+-]+) https://tests.reproducible-builds.org/rb-pkg/unstable/amd64/$1 [R=301,L]
+ RewriteCond /var/lib/jenkins/userContent/reproducible/debian/rb-pkg/unstable/amd64/$1 -f
+ RewriteRule ^/rb-pkg/([a-z0-9.+-]+) https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/$1 [R=301,L]
# the same for /dbd/
RewriteCond %{HTTP_HOST} reproducible\.debian\.net
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
- RewriteCond /var/lib/jenkins/userContent/reproducible/dbd/unstable/amd64/$1 -f
- RewriteRule ^/dbd/([a-z0-9.+-_]+) https://tests.reproducible-builds.org/dbd/unstable/amd64/$1 [R=301,L]
+ RewriteCond /var/lib/jenkins/userContent/reproducible/debian/dbd/unstable/amd64/$1 -f
+ RewriteRule ^/dbd/([a-z0-9.+-_]+) https://tests.reproducible-builds.org/debian/dbd/unstable/amd64/$1 [R=301,L]
# the same for /rbuild/
RewriteCond %{HTTP_HOST} reproducible\.debian\.net
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
- RewriteCond /var/lib/jenkins/userContent/reproducible/rbuild/unstable/amd64/$1 -f
- RewriteRule ^/rbuild/([a-z0-9.+-_]+) https://tests.reproducible-builds.org/rbuild/unstable/amd64/$1 [R=301,L]
+ RewriteCond /var/lib/jenkins/userContent/reproducible/debian/rbuild/unstable/amd64/$1 -f
+ RewriteRule ^/rbuild/([a-z0-9.+-_]+) https://tests.reproducible-builds.org/debian/rbuild/unstable/amd64/$1 [R=301,L]
# the same for /buildinfo/
RewriteCond %{HTTP_HOST} reproducible\.debian\.net
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
- RewriteCond /var/lib/jenkins/userContent/reproducible/buildinfo/unstable/amd64/$1 -f
- RewriteRule ^/buildinfo/([a-z0-9.+-_]+) https://tests.reproducible-builds.org/buildinfo/unstable/amd64/$1 [R=301,L]
+ RewriteCond /var/lib/jenkins/userContent/reproducible/debian/buildinfo/unstable/amd64/$1 -f
+ RewriteRule ^/buildinfo/([a-z0-9.+-_]+) https://tests.reproducible-builds.org/debian/buildinfo/unstable/amd64/$1 [R=301,L]
# redirect some rb.d.n/index_*.html to the suite/arch relative one
RewriteCond %{HTTP_HOST} reproducible\.debian\.net
RewriteCond %{REQUEST_FILENAME} !-f
@@ -272,23 +272,23 @@ Use common-debian-service-https-redirect reproducible-builds.org
RewriteCond %{REQUEST_URI} ^/index_last_24h.html$ [or]
RewriteCond %{REQUEST_URI} ^/index_last_48h.html$ [or]
RewriteCond %{REQUEST_URI} ^/index_all_abc.html$
- RewriteRule ^/?(.+) https://tests.reproducible-builds.org/unstable/amd64/$1 [R=301,L]
+ RewriteRule ^/?(.+) https://tests.reproducible-builds.org/debian/unstable/amd64/$1 [R=301,L]
# redirect (/testing|unstable|/experimental) to (/testing|/unstable|/experimental)/index_suite_amd64_stats.html
# note: the missing slash in the RewriteRule is wanted to avoid a double slash
RewriteCond %{HTTP_HOST} reproducible\.debian\.net
RewriteCond %{REQUEST_URI} ^/(testing|unstable|experimental)(/|)$
- RewriteRule ^/(.*) https://tests.reproducible-builds.org/$1/index_suite_amd64_stats.html [R,L]
+ RewriteRule ^/(.*) https://tests.reproducible-builds.org/debian/$1/index_suite_amd64_stats.html [R,L]
# redirect (/testing|unstable|/experimental)/(amd64|armhf|i386) to (/testing|/unstable|/experimental)/index_suite_(amd64|armhf|i386)_stats.html
RewriteCond %{HTTP_HOST} reproducible\.debian\.net
RewriteCond %{REQUEST_URI} ^/(testing|unstable|experimental)/(amd64|armhf|i386)(/|)$
- RewriteRule ^/([a-z0-9]+)/([a-z0-9]+) https://tests.reproducible-builds.org/$1/index_suite_$2_stats.html [R,L]
+ RewriteRule ^/([a-z0-9]+)/([a-z0-9]+) https://tests.reproducible-builds.org/debian/$1/index_suite_$2_stats.html [R,L]
# redirect (/(amd64|armhf|i386) to (/testing|/unstable|/experimental)/index_suite_(amd64|armhf|i386)_stats.html
RewriteCond %{HTTP_HOST} reproducible\.debian\.net
RewriteCond %{REQUEST_URI} ^/(amd64|armhf|i386)(/|)$
- RewriteRule ^/([a-z0-9]+) https://tests.reproducible-builds.org/unstable/index_suite_$1_stats.html [R,L]
+ RewriteRule ^/([a-z0-9]+) https://tests.reproducible-builds.org/debian/unstable/index_suite_$1_stats.html [R,L]
# redirect /coreboot/ to coreboot/coreboot.html
# note: the missing slash in the RewriteRule is wanted to avoid a double slash
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git
More information about the Qa-jenkins-scm
mailing list