summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2017-04-07 13:32:41 +0200
committerHolger Levsen <holger@layer-acht.org>2017-04-07 13:32:41 +0200
commitb8d268f5848846c63762a33b76de76e8e0255284 (patch)
tree4604c9404013e45fc4427a09c8d9cdc0768ee036
parent1ba9403bae9f1de9a6b071ba40e461fa93ee4ca7 (diff)
downloadjenkins.debian.net-b8d268f5848846c63762a33b76de76e8e0255284.tar.xz
chroot-installation: warn about transitional packages installed in sid
Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rwxr-xr-xbin/chroot-installation.sh15
-rwxr-xr-xjob-cfg/chroot-installation.yaml.py4
2 files changed, 17 insertions, 2 deletions
diff --git a/bin/chroot-installation.sh b/bin/chroot-installation.sh
index 696b8185..f9bb3af0 100755
--- a/bin/chroot-installation.sh
+++ b/bin/chroot-installation.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2012-2016 Holger Levsen <holger@layer-acht.org>
+# Copyright 2012-2017 Holger Levsen <holger@layer-acht.org>
# released under the GPLv=2
DEBUG=true
@@ -279,6 +279,19 @@ if [ "$3" != "" ] ; then
esac
fi
+#
+# in sid: find and warn about transitional packages being installed
+#
+if [ "$DISTRO" = "sid" ] ; then
+ ( sudo chroot $CHROOT_TARGET dpkg -l | grep -i "Transitional" 2>/dev/null ) > $TMPFILE
+ if [ -s $TMPFILE ] ; then
+ echo
+ echo "Warning: Transitional packages found:"
+ cat $TMPFILE
+ fi
+ rm -f $TMPFILE 2>/dev/null
+fi
+
echo "Debug: Removing trap."
trap - INT TERM EXIT
echo "Debug: Cleanup fine"
diff --git a/job-cfg/chroot-installation.yaml.py b/job-cfg/chroot-installation.yaml.py
index f429b46c..1a151457 100755
--- a/job-cfg/chroot-installation.yaml.py
+++ b/job-cfg/chroot-installation.yaml.py
@@ -244,7 +244,9 @@ data.append(
'first-failure': True,
'fixed': True,
'recipients': '{my_recipients}',
- 'subject': '$BUILD_STATUS: $JOB_NAME/$BUILD_NUMBER'}}],
+ 'subject': '$BUILD_STATUS: $JOB_NAME/$BUILD_NUMBER'}},
+ { 'logparser': { 'parse-rules': '/srv/jenkins/logparse/chroot-installation.rules',
+ 'unstable-on-warning': True,}}],
'triggers': [{ 'timed': '{my_time}'}],
'wrappers': [{ 'timeout': { 'timeout': 360}}]}})
data.append(