summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-10-10 02:01:53 +0200
committerHolger Levsen <holger@layer-acht.org>2015-10-10 02:01:53 +0200
commit71a34d5dd32a6d53a631357cc5368b7b269daa64 (patch)
treee13d6c5235a4eccd74b466f7b65115f382bf757d
parent2eab3acf1b3efe7a043f385135726c30bc6c6b87 (diff)
downloadjenkins.debian.net-71a34d5dd32a6d53a631357cc5368b7b269daa64.tar.xz
reproducible: mv /var/lib/jenkins/stale_builds.txt /var/log/jenkins/stale_builds.log
-rwxr-xr-xbin/reproducible_build.sh8
-rwxr-xr-xbin/reproducible_maintenance.sh2
2 files changed, 5 insertions, 5 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index 73048284..a8d33be8 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -407,11 +407,11 @@ choose_package() {
BAD_BUILDS=$(mktemp --tmpdir=$TMPDIR)
sqlite3 -init $INIT ${PACKAGES_DB} "SELECT package_id, date_build_started, builder FROM schedule WHERE builder LIKE '${BUILDER_PREFIX}%'" > $BAD_BUILDS
if [ -s "$BAD_BUILDS" ] ; then
- # stale_builds.txt is mailed once a day by reproducible_maintenance.sh
- echo "$(date -u) - stale builds found, cleaning db from these:" | tee -a /var/lib/jenkins/stale_builds.txt
- cat $BAD_BUILDS | tee -a /var/lib/jenkins/stale_builds.txt
+ # stale_builds.log is mailed once a day by reproducible_maintenance.sh
+ echo "$(date -u) - stale builds found, cleaning db from these:" | tee -a /var/log/jenkins/stale_builds.log
+ cat $BAD_BUILDS | tee -a /var/log/jenkins/stale_builds.log
sqlite3 -init $INIT ${PACKAGES_DB} "UPDATE schedule SET date_build_started='', builder='' WHERE builder LIKE '${BUILDER_PREFIX}%'"
- echo >> /var/lib/jenkins/stale_builds.txt
+ echo >> /var/log/jenkins/stale_builds.log
fi
rm -f $BAD_BUILDS
# mark build attempt, first test if none else marked a build attempt recently
diff --git a/bin/reproducible_maintenance.sh b/bin/reproducible_maintenance.sh
index 37b972a3..88ea9dfa 100755
--- a/bin/reproducible_maintenance.sh
+++ b/bin/reproducible_maintenance.sh
@@ -329,7 +329,7 @@ fi
# daily mails
if [ "$HOSTNAME" = "$MAINNODE" ] && [ $(date -u +%H) -eq 0 ] ; then
# once a day, send mail about builder problems
- for PROBLEM in /var/lib/jenkins/stale_builds.txt /var/log/jenkins/reproducible-race-conditions.log /var/log/jenkins/reproducible-diskspace-issues.log ; do
+ for PROBLEM in /var/log/jenkins/stale_builds.log /var/log/jenkins/reproducible-race-conditions.log /var/log/jenkins/reproducible-diskspace-issues.log ; do
if [ -s $PROBLEM ] ; then
TMPFILE=$(mktemp --tmpdir=$TEMPDIR maintenance-XXXXXXXXXXXX)
mv $PROBLEM $TMPFILE