diff options
| author | Mattia Rizzolo <mattia@mapreri.org> | 2014-12-17 17:00:03 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2014-12-17 17:36:21 +0100 |
| commit | 08d368d36bad50af0f5dacf77befe664f451d60b (patch) | |
| tree | e47f00e682d45f320ef91e119395cf519a7c387a | |
| parent | e9ce61800739a5fe3cea136f4e08b507a3201a4f (diff) | |
| download | jenkins.debian.net-08d368d36bad50af0f5dacf77befe664f451d60b.tar.xz | |
reproducible: use host-relative urls when possible, and reproducible.debian.net when it makes sense
| -rwxr-xr-x | bin/reproducible_common.sh | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index 37fc6943..5e3f6465 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -101,6 +101,7 @@ EOF fi # common variables +REPRODUCIBLE_URL=https://reproducible.debian.net DBDCHROOT_READLOCK=/var/lib/jenkins/reproducible-dbdchroot.readlock DBDCHROOT_WRITELOCK=/var/lib/jenkins/reproducible-dbdchroot.writelock @@ -179,7 +180,7 @@ set_icon() { write_icon() { # ICON and STATE_TARGET_NAME are set by set_icon() - write_page "<a href=\"$JENKINS_URL/userContent/index_${STATE_TARGET_NAME}.html\" target=\"_parent\"><img src=\"$JENKINS_URL/userContent/static/$ICON\" alt=\"${STATE_TARGET_NAME} icon\" /></a>" + write_page "<a href=\"/userContent/index_${STATE_TARGET_NAME}.html\" target=\"_parent\"><img src=\"/userContent/static/$ICON\" alt=\"${STATE_TARGET_NAME} icon\" /></a>" } write_page_header() { @@ -187,7 +188,7 @@ write_page_header() { BUILDINFO_ON_PAGE=false 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>$2</title></head>" write_page "<body><header><h2>$2</h2>" if [ "$1" = "$MAINVIEW" ] ; then @@ -217,7 +218,7 @@ write_page_header() { else SPOKEN_TARGET=${SPOKENTARGET[$TARGET]} fi - write_page "<li><a href=\"$JENKINS_URL/userContent/index_${TARGET}.html\">${SPOKEN_TARGET}</a></li>" + write_page "<li><a href=\"/userContent/index_${TARGET}.html\">${SPOKEN_TARGET}</a></li>" done write_page "</ul>" write_page "</header>" @@ -243,7 +244,7 @@ publish_page() { cp $PAGE /var/lib/jenkins/userContent/reproducible.html fi rm $PAGE - echo "Enjoy $JENKINS_URL/userContent/$PAGE" + echo "Enjoy $REPRODUCIBLE_URL/userContent/$PAGE" } set_package_star() { @@ -266,7 +267,7 @@ force_package_targets() { for PKG in $@ ; do if [ -f /var/lib/jenkins/userContent/rb-pkg/$PKG.html ] ; then set_package_class - LINKTARGET[$PKG]="<a href=\"$JENKINS_URL/userContent/rb-pkg/$PKG.html\" $CLASS>$PKG</a>" + LINKTARGET[$PKG]="<a href=\"/userContent/rb-pkg/$PKG.html\" $CLASS>$PKG</a>" else LINKTARGET[$PKG]="$PKG" fi @@ -293,7 +294,7 @@ init_pkg_page() { echo "<title>$1 - reproducible builds results</title></head>" >> ${PKG_FILE} echo "<body><table class=\"head\"><tr><td><span style=\"font-size:1.2em;\">$1</span> $2" >> ${PKG_FILE} set_icon "$3" $5 # this sets $STATE_TARGET_NAME and $ICON - echo "<a href=\"$JENKINS_URL/userContent/index_${STATE_TARGET_NAME}.html\" target=\"_parent\"><img src=\"$JENKINS_URL/userContent/static/$ICON\" alt=\"${STATE_TARGET_NAME} icon\" /></a>" >> ${PKG_FILE} + echo "<a href=\"/userContent/index_${STATE_TARGET_NAME}.html\" target=\"_parent\"><img src=\"/userContent/static/$ICON\" alt=\"${STATE_TARGET_NAME} icon\" /></a>" >> ${PKG_FILE} echo "<span style=\"font-size:0.9em;\">at $4:</span> " >> ${PKG_FILE} } @@ -302,7 +303,7 @@ append2pkg_page() { } finish_pkg_page() { - echo "</td><td style=\"text-align:right; font-size:0.9em;\"><a href=\"$JENKINS_URL/userContent/reproducible.html\" target=\"_parent\">reproducible builds</a></td></tr></table>" >> ${PKG_FILE} + echo "</td><td style=\"text-align:right; font-size:0.9em;\"><a href=\"/userContent/reproducible.html\" target=\"_parent\">reproducible builds</a></td></tr></table>" >> ${PKG_FILE} echo "<iframe name=\"main\" src=\"$1\" width=\"100%\" height=\"98%\" frameborder=\"0\">" >> ${PKG_FILE} echo "<p>Your browser does not support iframes. Use a different one or follow the links above.</p>" >> ${PKG_FILE} echo "</iframe>" >> ${PKG_FILE} @@ -325,7 +326,7 @@ process_packages() { MAINLINK="" NOTES_LINK="" if [ -f ${NOTES_PATH}/${PKG}_note.html ] ; then - NOTES_LINK=" <a href=\"$JENKINS_URL/userContent/notes/${PKG}_note.html\" target=\"main\">notes</a> " + NOTES_LINK=" <a href=\"/userContent/notes/${PKG}_note.html\" target=\"main\">notes</a> " fi set_package_star if [ -f "/var/lib/jenkins/userContent/buildinfo/${PKG}_${EVERSION}_amd64.buildinfo" ] ; then @@ -335,19 +336,19 @@ process_packages() { init_pkg_page "$PKG" "$VERSION" "$STATUS" "$BUILD_DATE" "$STAR" append2pkg_page "${NOTES_LINK}" if [ -f "/var/lib/jenkins/userContent/buildinfo/${PKG}_${EVERSION}_amd64.buildinfo" ] ; then - append2pkg_page " <a href=\"$JENKINS_URL/userContent/buildinfo/${PKG}_${EVERSION}_amd64.buildinfo\" target=\"main\">buildinfo</a> " - MAINLINK="$JENKINS_URL/userContent/buildinfo/${PKG}_${EVERSION}_amd64.buildinfo" + append2pkg_page " <a href=\"/userContent/buildinfo/${PKG}_${EVERSION}_amd64.buildinfo\" target=\"main\">buildinfo</a> " + MAINLINK="/userContent/buildinfo/${PKG}_${EVERSION}_amd64.buildinfo" fi if [ -f "/var/lib/jenkins/userContent/dbd/${PKG}_${EVERSION}.debbindiff.html" ] ; then - append2pkg_page " <a href=\"$JENKINS_URL/userContent/dbd/${PKG}_${EVERSION}.debbindiff.html\" target=\"main\">debbindiff</a> " - MAINLINK="$JENKINS_URL/userContent/dbd/${PKG}_${EVERSION}.debbindiff.html" + append2pkg_page " <a href=\"/userContent/dbd/${PKG}_${EVERSION}.debbindiff.html\" target=\"main\">debbindiff</a> " + MAINLINK="/userContent/dbd/${PKG}_${EVERSION}.debbindiff.html" fi RBUILD_LOG="rbuild/${PKG}_${EVERSION}.rbuild.log" if [ -f "/var/lib/jenkins/userContent/${RBUILD_LOG}" ] ; then SIZE=$(du -sh "/var/lib/jenkins/userContent/${RBUILD_LOG}" |cut -f1) - append2pkg_page " <a href=\"$JENKINS_URL/userContent/${RBUILD_LOG}\" target=\"main\">rbuild ($SIZE)</a> " + append2pkg_page " <a href=\"/userContent/${RBUILD_LOG}\" target=\"main\">rbuild ($SIZE)</a> " if [ "$MAINLINK" = "" ] ; then - MAINLINK="$JENKINS_URL/userContent/${RBUILD_LOG}" + MAINLINK="/userContent/${RBUILD_LOG}" fi fi append2pkg_page " <a href=\"https://packages.qa.debian.org/${PKG}\" target=\"main\">PTS</a> " @@ -356,7 +357,7 @@ process_packages() { append2pkg_page " <a href=\"https://sources.debian.net/src/${PKG}/${VERSION}/debian/rules\" target=\"main\">debian/rules</a> " if [ ! -z "${NOTES_LINK}" ] ; then - MAINLINK="$JENKINS_URL/userContent/notes/${PKG}_note.html" + MAINLINK="/userContent/notes/${PKG}_note.html" fi finish_pkg_page "$MAINLINK" fi |