summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2016-01-06 12:06:51 +0100
committerHolger Levsen <holger@layer-acht.org>2016-01-06 12:06:51 +0100
commit56b38f8a346c53d45c8acbdb695bf98d586db08f (patch)
tree15d2de22eef957c74ec9a81adcb4a9b6e293a8f0
parent6b289c6eba9c43451cbab5ba76288d310f13d473 (diff)
downloadjenkins.debian.net-56b38f8a346c53d45c8acbdb695bf98d586db08f.tar.xz
reproducible archlinux: only cause warning for maintenance job if updating archlinux schroot fails
-rwxr-xr-xbin/reproducible_maintenance.sh10
-rw-r--r--logparse/reproducible.rules1
2 files changed, 10 insertions, 1 deletions
diff --git a/bin/reproducible_maintenance.sh b/bin/reproducible_maintenance.sh
index 2a60a70c..fab9f67a 100755
--- a/bin/reproducible_maintenance.sh
+++ b/bin/reproducible_maintenance.sh
@@ -100,11 +100,19 @@ done
set -e
# for Archlinux
+set +e
if [ "$HOSTNAME" = "${ARCHLINUX_BUILD_NODE}" ] ; then
echo "$(date -u) - updating Archlinux schroot now."
schroot --directory /tmp -c source:jenkins-reproducible-archlinux -u root -- pacman -Syu --noconfirm
- echo "$(date -u) - updating Archlinux schroot done."
+ RESULT=$?
+ if [ $RESULT -eq 1 ] ; then
+ echo "Warning: failed to update Archlinux schroot."
+ DIRTY=true
+ else
+ echo "$(date -u) - updating Archlinux schroot done."
+ fi
fi
+set -e
# delete old temp directories
echo "$(date -u) - Deleting temp directories, older than 2 days."
diff --git a/logparse/reproducible.rules b/logparse/reproducible.rules
index 828f1aaa..dbd54bcc 100644
--- a/logparse/reproducible.rules
+++ b/logparse/reproducible.rules
@@ -13,3 +13,4 @@ warning /Warning: cannot update html pages for.+/
warning /Warning: too much difference for .+, aborting. Please investigate and update manually./
warning /Warning: couldn't delete old files from.+/
warning /Warning: failed to update the .+ schroot./
+warning /Warning: failed to update Archlinux schroot./