[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: improve output
Holger Levsen
holger at moszumanska.debian.org
Mon Oct 19 08:04:50 UTC 2015
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 a155f9142d5c15cc0e6c297c8cb0d858b8f6ce56
Author: Holger Levsen <holger at layer-acht.org>
Date: Mon Oct 19 10:03:59 2015 +0200
reproducible: improve output
---
bin/reproducible_coreboot.sh | 2 +-
bin/reproducible_freebsd.sh | 20 ++++++++++----------
bin/reproducible_netbsd.sh | 12 ++++++------
bin/reproducible_openwrt.sh | 2 +-
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/bin/reproducible_coreboot.sh b/bin/reproducible_coreboot.sh
index 5bb20b5..6616cfe 100755
--- a/bin/reproducible_coreboot.sh
+++ b/bin/reproducible_coreboot.sh
@@ -49,7 +49,7 @@ trap cleanup_tmpdirs INT TERM EXIT
cd $TMPBUILDDIR
echo "============================================================================="
-echo "$(date -u) - Cloning the coreboot git repository with submodules."
+echo "$(date -u) - Cloning coreboot git repository with submodules."
echo "============================================================================="
git clone --recursive http://review.coreboot.org/p/coreboot.git
cd coreboot
diff --git a/bin/reproducible_freebsd.sh b/bin/reproducible_freebsd.sh
index d41bd89..3cd20e1 100755
--- a/bin/reproducible_freebsd.sh
+++ b/bin/reproducible_freebsd.sh
@@ -27,7 +27,7 @@ create_results_dirs() {
save_freebsd_results(){
local RUN=$1
echo "============================================================================="
- echo "$(date -u) - Saving freebsd ${FREEBSD_VERSION} artifacts for $RUN."
+ echo "$(date -u) - Saving FreeBSD ${FREEBSD_VERSION} build results for $RUN run."
echo "============================================================================="
mkdir -p $TMPDIR/$RUN/
# copy results over
@@ -45,7 +45,7 @@ FREEBSD_TARGET="release/10.2.0"
RSSH="ssh freebsd-jenkins.debian.net"
RSCP="scp -r freebsd-jenkins.debian.net"
TMPBUILDDIR=/usr/src
-$RSSH 'sudo rm -rf /usr/src ; sudo mkdir /usr/src ; sudo chown jenkins /usr/src' ### this is tmpfs on linux, we should move this to tmpfs on freebsd too
+$RSSH 'sudo rm -rf /usr/src ; sudo mkdir /usr/src ; sudo chown jenkins /usr/src' ### this is tmpfs on linux, we should move this to tmpfs on FreeBSD too
TMPDIR=$($RSSH 'TMPDIR=/srv/reproducible-results mktemp -d') # used to compare results
DATE=$(date -u +'%Y-%m-%d')
START=$(date +'%s')
@@ -56,23 +56,23 @@ echo "==========================================================================
$RSSH freebsd-version
echo "============================================================================="
-echo "$(date -u) - Cloning the freebsd git repository (which is autosynced with their CVS repository)"
+echo "$(date -u) - Cloning FreeBSD git repository."
echo "============================================================================="
$RSSH git clone --depth 1 --branch $FREEBSD_TARGET https://github.com/freebsd/freebsd.git $TMPBUILDDIR
FREEBSD=$($RSSH "cd $TMPBUILDDIR ; git log -1")
FREEBSD_VERSION=$($RSSH "cd $TMPBUILDDIR ; git describe --always")
-echo "This is freebsd $FREEBSD_VERSION."
+echo "This is FreeBSD $FREEBSD_VERSION."
echo
$RSSH "cd $TMPBUILDDIR ; git log -1"
TARGET_NAME=$(echo "freebsd_${FREEBSD_TARGET}_git${FREEBSD_VERSION}" | sed "s#/#-#g")
echo "============================================================================="
-echo "$(date -u) - Building freebsd ${FREEBSD_VERSION} - first build run."
+echo "$(date -u) - Building FreeBSD ${FREEBSD_VERSION} - first build run."
echo "============================================================================="
export TZ="/usr/share/zoneinfo/Etc/GMT+12"
export LANG="en_GB.UTF-8"
# actually build everything
-NUM_CPU=4 # if someone could tell me how to determine this on freebsd, this would be neat
+NUM_CPU=4 # if someone could tell me how to determine this on FreeBSD, this would be neat
$RSSH "cd $TMPBUILDDIR ; TZ=$TZ LANG=$LANG sudo make -j $NUM_CPU buildworld"
$RSSH "cd $TMPBUILDDIR ; TZ=$TZ LANG=$LANG sudo make -j $NUM_CPU buildkernel"
$RSSH "cd $TMPBUILDDIR ; TZ=$TZ LANG=$LANG DESTDIR=$TMPDIR sudo make -j $NUM_CPU installworld"
@@ -83,7 +83,7 @@ save_freebsd_results b1
echo "============================================================================="
-echo "$(date -u) - Building freebsd - second build run."
+echo "$(date -u) - Building FreeBSD - second build run."
echo "============================================================================="
export TZ="/usr/share/zoneinfo/Etc/GMT-14"
export LANG="fr_CH.UTF-8"
@@ -112,7 +112,7 @@ umask 0022
TIMEOUT="30m"
DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1)"
echo "============================================================================="
-echo "$(date -u) - Running $DIFFOSCOPE on freebsd..."
+echo "$(date -u) - Running $DIFFOSCOPE on FreeBSD build results."
echo "============================================================================="
FILES_HTML=$(mktemp --tmpdir=$TMPDIR)
echo " <ul>" > $FILES_HTML
@@ -175,13 +175,13 @@ cat > $PAGE <<- EOF
<div class="page-content">
EOF
write_page_intro FreeBSD
-write_page " <p>$GOOD_FILES ($GOOD_PERCENT%) out of $ALL_FILES built freebsd files were reproducible in our test setup"
+write_page " <p>$GOOD_FILES ($GOOD_PERCENT%) out of $ALL_FILES FreeBSD files were reproducible in our test setup"
if [ "$GOOD_PERCENT" = "100.0" ] ; then
write_page "!"
else
write_page "."
fi
-write_page " These tests were last run on $DATE for version ${FREEBSD_VERSION} using ${DIFFOSCOPE}. <em>This is very much work in progress, especially the build targets should be choosen better...</em></p>"
+write_page " These tests were last run on $DATE for version ${FREEBSD_VERSION} using ${DIFFOSCOPE}. <em>This is very much work in progress...</em></p>"
write_explaination_table FreeBSD
cat $FILES_HTML >> $PAGE
write_page " <p><pre>"
diff --git a/bin/reproducible_netbsd.sh b/bin/reproducible_netbsd.sh
index a2cb28f..b6d35b1 100755
--- a/bin/reproducible_netbsd.sh
+++ b/bin/reproducible_netbsd.sh
@@ -44,7 +44,7 @@ trap cleanup_tmpdirs INT TERM EXIT
cd $TMPBUILDDIR
echo "============================================================================="
-echo "$(date -u) - Cloning the netbsd git repository (which is autosynced with their CVS repository)"
+echo "$(date -u) - Cloning the NetBSD git repository (which is synced with the NetBSD CVS repository)"
echo "============================================================================="
git clone --depth 1 https://github.com/jsonn/src
mv src netbsd
@@ -62,7 +62,7 @@ git log -1
export MKREPRO="yes"
echo "============================================================================="
-echo "$(date -u) - Building netbsd ${NETBSD_VERSION} - first build run."
+echo "$(date -u) - Building NetBSD ${NETBSD_VERSION} - first build run."
echo "============================================================================="
export TZ="/usr/share/zoneinfo/Etc/GMT+12"
# actually build everything
@@ -78,14 +78,14 @@ for MACHINE in $MACHINES ; do
done
echo "============================================================================="
-echo "$(date -u) - Building netbsd ${NETBSD_VERSION} - cleaning up between builds."
+echo "$(date -u) - Building NetBSD ${NETBSD_VERSION} - cleaning up between builds."
echo "============================================================================="
rm obj/releasedir -r
rm obj/destdir.* -r
# we keep the toolchain(s)
echo "============================================================================="
-echo "$(date -u) - Building netbsd - second build run."
+echo "$(date -u) - Building NetBSD - second build run."
echo "============================================================================="
export TZ="/usr/share/zoneinfo/Etc/GMT-14"
export LANG="fr_CH.UTF-8"
@@ -124,7 +124,7 @@ rm -r $TMPBUILDDIR/netbsd
TIMEOUT="30m"
DIFFOSCOPE="$(schroot --directory /tmp -c source:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1)"
echo "============================================================================="
-echo "$(date -u) - Running $DIFFOSCOPE on netbsd..."
+echo "$(date -u) - Running $DIFFOSCOPE on NetBSD build results..."
echo "============================================================================="
FILES_HTML=$(mktemp --tmpdir=$TMPDIR)
GOOD_FILES_HTML=$(mktemp --tmpdir=$TMPDIR)
@@ -199,7 +199,7 @@ cat > $PAGE <<- EOF
<div class="page-content">
EOF
write_page_intro NetBSD
-write_page " <p>$GOOD_FILES ($GOOD_PERCENT%) out of $ALL_FILES built netbsd files were reproducible in our test setup"
+write_page " <p>$GOOD_FILES ($GOOD_PERCENT%) out of $ALL_FILES built NetBSD files were reproducible in our test setup"
if [ "$GOOD_PERCENT" = "100.0" ] ; then
write_page "!"
else
diff --git a/bin/reproducible_openwrt.sh b/bin/reproducible_openwrt.sh
index e855d7c..99ae14e 100755
--- a/bin/reproducible_openwrt.sh
+++ b/bin/reproducible_openwrt.sh
@@ -147,7 +147,7 @@ trap cleanup_tmpdirs INT TERM EXIT
cd $TMPBUILDDIR
echo "============================================================================="
-echo "$(date -u) - Cloning the OpenWrt git repository."
+echo "$(date -u) - Cloning OpenWrt git repository."
echo "============================================================================="
git clone --depth 1 git://git.openwrt.org/openwrt.git
cd openwrt
--
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