summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-12-17 17:46:53 +0100
committerHolger Levsen <holger@layer-acht.org>2014-12-17 17:46:53 +0100
commitfac844021d3108a9b7186020327485f7c95cbfd8 (patch)
tree1c7bf8c5bb7b8f826016a827d0e06593ec33c2a0 /bin
parent08d368d36bad50af0f5dacf77befe664f451d60b (diff)
downloadjenkins.debian.net-fac844021d3108a9b7186020327485f7c95cbfd8.tar.xz
fixup last commit
Diffstat (limited to 'bin')
-rwxr-xr-xbin/reproducible_build.sh6
-rwxr-xr-xbin/reproducible_common.sh1
-rwxr-xr-xbin/reproducible_html_dd_list.sh2
-rwxr-xr-xbin/reproducible_html_graphs.sh2
-rwxr-xr-xbin/reproducible_html_notes.sh6
-rwxr-xr-xbin/reproducible_json.sh2
6 files changed, 9 insertions, 10 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 835fd802..75295492 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -31,7 +31,7 @@ unschedule_from_db() {
touch -d $PREDATE /var/lib/jenkins/userContent/rb-pkg/${SRCPACKAGE}.html
process_packages $SRCPACKAGE
echo
- echo "Successfully updated the database and updated $JENKINS_URL/userContent/rb-pkg/$SRCPACKAGE.html"
+ echo "Successfully updated the database and updated $REPRODUCIBLE_URL/userContent/rb-pkg/$SRCPACKAGE.html"
echo
}
@@ -162,9 +162,9 @@ else
rm -f $DBDCHROOT_READLOCK
echo | tee -a ${RBUILDLOG}
if [ $RESULT -eq 124 ] ; then
- echo "$(date) - debbindiff was killed after running into timeouot... maybe there is still $JENKINS_URL/userContent/dbd/${LOGFILE}" | tee -a ${RBUILDLOG}
+ echo "$(date) - debbindiff was killed after running into timeouot... maybe there is still $REPRODUCIBLE_URL/userContent/dbd/${LOGFILE}" | tee -a ${RBUILDLOG}
elif [ $RESULT -eq 1 ] ; then
- DEBBINDIFFOUT="debbindiff found issues, please investigate $JENKINS_URL/userContent/dbd/${LOGFILE}"
+ DEBBINDIFFOUT="debbindiff found issues, please investigate $REPRODUCIBLE_URL/userContent/dbd/${LOGFILE}"
fi
if [ ! -f ./${LOGFILE} ] && [ -f b1/${BUILDINFO} ] ; then
cp b1/${BUILDINFO} /var/lib/jenkins/userContent/buildinfo/ > /dev/null 2>&1
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 5e3f6465..ba5bdb15 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -104,7 +104,6 @@ fi
REPRODUCIBLE_URL=https://reproducible.debian.net
DBDCHROOT_READLOCK=/var/lib/jenkins/reproducible-dbdchroot.readlock
DBDCHROOT_WRITELOCK=/var/lib/jenkins/reproducible-dbdchroot.writelock
-
# shop trailing slash
JENKINS_URL=${JENKINS_URL:0:-1}
diff --git a/bin/reproducible_html_dd_list.sh b/bin/reproducible_html_dd_list.sh
index ce29b54c..fa38cf26 100755
--- a/bin/reproducible_html_dd_list.sh
+++ b/bin/reproducible_html_dd_list.sh
@@ -28,7 +28,7 @@ while IFS= read -r LINE ; do
if [ "$UPLOADERS" = "$PACKAGE" ] ; then
UPLOADERS=""
fi
- write_page " <a href=\"$JENKINS_URL/userContent/rb-pkg/$PACKAGE.html\">$PACKAGE</a> $UPLOADERS"
+ write_page " <a href=\"/userContent/rb-pkg/$PACKAGE.html\">$PACKAGE</a> $UPLOADERS"
else
LINE="$(echo $LINE | sed 's#&#\&amp;#g ; s#<#\&lt;#g ; s#>#\&gt;#g')"
write_page "$LINE"
diff --git a/bin/reproducible_html_graphs.sh b/bin/reproducible_html_graphs.sh
index 02532fc2..5e5c9a19 100755
--- a/bin/reproducible_html_graphs.sh
+++ b/bin/reproducible_html_graphs.sh
@@ -171,7 +171,7 @@ for i in 0 1 3 ; do
if [ "$i" = "3" ] ; then
write_usertag_table
fi
- write_page " <a href=\"$JENKINS_URL/userContent/${TABLE[$i]}.png\"><img src=\"$JENKINS_URL/userContent/${TABLE[$i]}.png\" class=\"graph\" alt=\"${MAINLABEL[$i]}\"></a>"
+ write_page " <a href=\"/userContent/${TABLE[$i]}.png\"><img src=\"/userContent/${TABLE[$i]}.png\" class=\"graph\" alt=\"${MAINLABEL[$i]}\"></a>"
# redo pngs once a day
if [ ! -f /var/lib/jenkins/userContent/${TABLE[$i]}.png ] || [ -z $(find /var/lib/jenkins/userContent -maxdepth 1 -mtime +0 -name ${TABLE[$i]}.png) ] ; then
redo_png
diff --git a/bin/reproducible_html_notes.sh b/bin/reproducible_html_notes.sh
index db5c0aeb..5679d2e2 100755
--- a/bin/reproducible_html_notes.sh
+++ b/bin/reproducible_html_notes.sh
@@ -83,7 +83,7 @@ issues_loop() {
if [ "${p:0:2}" = "- " ] ; then
p="${p:2}"
fi
- write_page "<table class=\"body\"><tr><td>Identifier:</td><td><a href=\"$JENKINS_URL/userContent/issues/${p}_issue.html\" target=\"_parent\">$p</a></tr>"
+ write_page "<table class=\"body\"><tr><td>Identifier:</td><td><a href=\"/userContent/issues/${p}_issue.html\" target=\"_parent\">$p</a></tr>"
if [ "${ISSUES_URL[$p]}" != "" ] ; then
write_page "<tr><td>URL</td><td><a href=\"${ISSUES_URL[$p]}\" target=\"_blank\">${ISSUES_URL[$p]}</a></td></tr>"
fi
@@ -108,7 +108,7 @@ create_pkg_note() {
# write_page_header() is not used as it contains the <h2> tag...
write_page "<!DOCTYPE html><html><head>"
write_page "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />"
- write_page "<link href=\"$JENKINS_URL/userContent/static/style.css\" type=\"text/css\" rel=\"stylesheet\" />"
+ write_page "<link href=\"/userContent/static/style.css\" type=\"text/css\" rel=\"stylesheet\" />"
write_page "<title>Notes for $1</title></head>"
write_page "<body></header>"
write_page "<table class=\"body\">"
@@ -350,7 +350,7 @@ if $VALID_YAML ; then
write_page "<tr><th>Identified issues</th></tr>"
ISSUES=$(echo ${ISSUES} | sed -s "s# #\n#g" | sort | xargs echo)
for ISSUE in ${ISSUES} ; do
- write_page "<tr><td><a href=\"$JENKINS_URL/userContent/issues/${ISSUE}_issue.html\">${ISSUE}</a></td></tr>"
+ write_page "<tr><td><a href=\"/userContent/issues/${ISSUE}_issue.html\">${ISSUE}</a></td></tr>"
done
write_page "</table>"
else
diff --git a/bin/reproducible_json.sh b/bin/reproducible_json.sh
index df2727b5..1bbf0d19 100755
--- a/bin/reproducible_json.sh
+++ b/bin/reproducible_json.sh
@@ -41,6 +41,6 @@ done
write_json "]"
echo
-echo "$(date) - $JENKINS_URL/userContent/reproducible.json has been updated."
+echo "$(date) - $REPRODUCIBLE_URL/userContent/reproducible.json has been updated."
mv $JSON /var/lib/jenkins/userContent/reproducible.json
chmod 755 /var/lib/jenkins/userContent/reproducible.json