From 56b38f8a346c53d45c8acbdb695bf98d586db08f Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Wed, 6 Jan 2016 12:06:51 +0100 Subject: reproducible archlinux: only cause warning for maintenance job if updating archlinux schroot fails --- bin/reproducible_maintenance.sh | 10 +++++++++- logparse/reproducible.rules | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) 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./ -- cgit v1.2.3-54-g00ecf