summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-10-25 22:35:33 +0200
committerHolger Levsen <holger@layer-acht.org>2014-10-25 22:35:33 +0200
commit976e4771dcf51d6f5c4aa2a0bece78d350e9b106 (patch)
treee2cf39f50644c51a07cf1ec28dd0138120c661e5
parent45c79d054742194eea71ff2024b77c3f537135ff (diff)
downloadjenkins.debian.net-976e4771dcf51d6f5c4aa2a0bece78d350e9b106.tar.xz
leave changelog version and git commit id next to the build results too
-rwxr-xr-xbin/chroot-run.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/bin/chroot-run.sh b/bin/chroot-run.sh
index c92e4b73..07c6802d 100755
--- a/bin/chroot-run.sh
+++ b/bin/chroot-run.sh
@@ -82,10 +82,9 @@ cleanup() {
#
# special case debian-edu-doc
#
- CHANGES=$(cd $CHROOT_TARGET/tmp/ ; ls -1 debian-edu-doc_*.changes 2>/dev/null|| true)
+ CHANGES=$(ls -1 $CHROOT_TARGET/tmp/debian-edu-doc_*.changes 2>/dev/null|| true)
if [ ! -z "$CHANGES" ] ; then
echo "Extracting contents from .deb files..."
- cd $CHROOT_TARGET/tmp/
NEWDOC=$(mktemp -d)
for DEB in $(dcmd --deb $CHANGES) ; do
dpkg --extract $DEB $NEWDOC 2>/dev/null
@@ -94,8 +93,10 @@ cleanup() {
rm -rf $EDUDOC
mkdir $EDUDOC
mv $NEWDOC/usr/share/doc/debian-edu-doc-* $EDUDOC/
+ VERSION=$(echo $CHANGES | cut -d "_" -f2)
+ touch "$EDUDOC/${VERSION}_git${GIT_COMMIT:0:8}"
rm -r $NEWDOC
- MESSAGE="https://jenkins.debian.net/userContent/debian-edu-doc/ has been updated."
+ MESSAGE="https://jenkins.debian.net/userContent/debian-edu-doc/ has been updated from ${GIT_COMMIT:0:8}"
kgb-client --conf /srv/jenkins/kgb/debian-edu.conf --relay-msg "$MESSAGE"
echo
echo $MESSAGE