summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-05-19 12:27:22 +0200
committerHolger Levsen <holger@layer-acht.org>2015-05-19 12:50:33 +0200
commit67d561699425457f23fc9d56f3a3ae91760f6504 (patch)
treee21cd484f9ccd14910feeb4fb256ba670d5b9eef /bin
parentab5de8936e6de91700caf1cdeff98afd5cd9e042 (diff)
downloadjenkins.debian.net-67d561699425457f23fc9d56f3a3ae91760f6504.tar.xz
reproducible: cosmetic improvements
Diffstat (limited to 'bin')
-rwxr-xr-xbin/reproducible_build.sh12
-rwxr-xr-xbin/reproducible_common.sh10
2 files changed, 11 insertions, 11 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 4dc85879..8027c7a0 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -221,7 +221,7 @@ init_debbindiff() {
fi
done
if [ -f $DBDCHROOT_WRITELOCK ] || [ -f $DBDCHROOT_READLOCK ] ; then
- echo "Warning: lock $DBDCHROOT_WRITELOCK or [ -f $DBDCHROOT_READLOCK ] still exists, exiting."
+ echo "Warning: lock $DBDCHROOT_WRITELOCK or $DBDCHROOT_READLOCK still exists, exiting."
exit 1
fi
else
@@ -254,7 +254,7 @@ call_debbindiff() {
DBDSUITE="unstable"
fi
DBDVERSION="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-debbindiff debbindiff -- --version 2>&1)"
- echo "$(date) - $DBDVERSION will be used to compare the two builds now." | tee -a ${RBUILDLOG}
+ echo "$(date) - $DBDVERSION will be used to compare the two builds:" | tee -a ${RBUILDLOG}
set +e
set -x
( timeout $TIMEOUT schroot \
@@ -268,7 +268,7 @@ call_debbindiff() {
RESULT=$?
if ! "$DEBUG" ; then set +x ; fi
set -e
- cat $TMPLOG | tee -a $RBUILDLOG # print out dbd output
+ cat $TMPLOG | tee -a $RBUILDLOG # print dbd output
rm -f $DBDCHROOT_READLOCK $TMPLOG
echo | tee -a ${RBUILDLOG}
case $RESULT in
@@ -288,7 +288,7 @@ call_debbindiff() {
;;
*)
handle_ftbr "Something weird with $DBDVERSION (exit with $RESULT) happened and I don't know how to handle it"
- irc_message "Something weird with $DBDVERSION (exit with $RESULT) happened and I don't know how to handle it. Check out $BUILDLOG and $REPRODUCIBLE_URL/$SUITE/$ARCH/$SRCPACKAGE and investigate manually"
+ irc_message "Something weird with $DBDVERSION (exit with $RESULT) happened and I don't know how to handle it. Check $BUILDLOG and $REPRODUCIBLE_URL/$SUITE/$ARCH/$SRCPACKAGE and investigate manually"
;;
esac
print_out_duration
@@ -316,11 +316,11 @@ choose_package () {
init() {
if [ $SAVE_ARTIFACTS -eq 1 ] ; then
- local AANOUNCE="Artifacts will be preserved."
+ local ANNOUNCE="Artifacts will be preserved."
fi
create_results_dirs
echo "============================================================================="
- echo "Trying to reproducibly build ${SRCPACKAGE} in ${SUITE} on ${ARCH} now. $AANOUNCE"
+ echo "Trying to reproducibly build ${SRCPACKAGE} in ${SUITE} on ${ARCH} now. $ANNOUNCE"
echo "============================================================================="
# mark build attempt
if [ -z "$(sqlite3 -init $INIT ${PACKAGES_DB} "SELECT date_build_started FROM schedule WHERE package_id = '$SRCPKGID'")" ] ; then
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 47c266a9..d3493f27 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -39,9 +39,9 @@ DBDCHROOT_WRITELOCK=/var/lib/jenkins/reproducible-dbdchroot.writelock
# shop trailing slash
JENKINS_URL=${JENKINS_URL:0:-1}
-# tested suites
+# suites being tested
SUITES="testing unstable experimental"
-# tested arches
+# arches being tested
ARCHES="amd64"
# existing usertags
@@ -88,7 +88,7 @@ META_PKGSET[25]="maint_debian-ocaml"
schedule_packages() {
# these packages are manually scheduled, so should have high priority,
# so schedule them in the past, so they are picked earlier :)
- # the current date is subtracted twice, so that later manual scheduling comes first
+ # the current date is subtracted twice, so that packages scheduled later get higher will be picked sooner
DAYS=$(echo "$(date +'%j')*2"|bc)
HOURS=$(echo "$(date +'%H')*2"|bc)
MINS=$(date +'%M') # schedule on the full hour so we can recognize them easily
@@ -172,7 +172,7 @@ write_page_header() {
SPOKENTARGET["last_48h"]="packages tested in the last 48h"
SPOKENTARGET["all_abc"]="all tested packages (sorted alphabetically)"
SPOKENTARGET["dd-list"]="maintainers of unreproducible packages"
- SPOKENTARGET["pkg_sets"]="package sets stats"
+ SPOKENTARGET["pkg_sets"]="package sets"
SPOKENTARGET["suite_stats"]="suite: $SUITE"
SPOKENTARGET["repositories"]="repositories overview"
SPOKENTARGET["stats"]="reproducible stats"
@@ -182,7 +182,7 @@ write_page_header() {
write_page "<title>$2</title></head>"
write_page "<body><header><h2>$2</h2>"
if [ "$1" = "$MAINVIEW" ] ; then
- write_page "<p>These pages are showing the prospects of <a href=\"https://wiki.debian.org/ReproducibleBuilds\" target=\"_blank\">reproducible builds of Debian packages</a>."
+ write_page "<p>These pages are showing the <em>prospects</em> of <a href=\"https://wiki.debian.org/ReproducibleBuilds\" target=\"_blank\">reproducible builds of Debian packages</a>."
write_page " The results shown were obtained from <a href=\"$JENKINS_URL/view/reproducible\">several jobs</a> running on"
write_page " <a href=\"$JENKINS_URL/userContent/about.html#_reproducible_builds_jobs\">jenkins.debian.net</a>."
write_page " Thanks to <a href=\"https://www.profitbricks.co.uk\">Profitbricks</a> for donating the virtual machine this is running on!</p>"