diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-10-10 02:18:43 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-10-10 02:18:43 +0200 |
| commit | ef69476437c7071675a4a0867f91618c3540ecd6 (patch) | |
| tree | 6ebd3beaf1ebc987fcc4d79e79aee83ce90a3674 | |
| parent | f11b3cc452f10a7e69746d9c3837243545332ea9 (diff) | |
| download | jenkins.debian.net-ef69476437c7071675a4a0867f91618c3540ecd6.tar.xz | |
reproducible: sanitize naming scheme
| -rwxr-xr-x | bin/reproducible_build.sh | 9 | ||||
| -rwxr-xr-x | bin/reproducible_maintenance.sh | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index b96c1d7a..0ca68b3d 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -417,11 +417,12 @@ 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.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 + local STALELOG=/var/log/jenkins/reproducible-stale-builds.log + # reproducible-stale-builds.log is mailed once a day by reproducible_maintenance.sh + echo "$(date -u) - stale builds found, cleaning db from these:" | tee -a $STALELOG + cat $BAD_BUILDS | tee -a $STALELOG sqlite3 -init $INIT ${PACKAGES_DB} "UPDATE schedule SET date_build_started='', builder='' WHERE builder LIKE '${BUILDER_PREFIX}%'" - echo >> /var/log/jenkins/stale_builds.log + echo >> $STALELOG 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 7f683128..e955f7a8 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/log/jenkins/stale_builds.log /var/log/jenkins/reproducible-race-conditions.log /var/log/jenkins/reproducible-diskspace-issues.log /var/log/jenkins/reproducible-remote-error.log; do + for PROBLEM in /var/log/jenkins/reproducible-stale-builds.log /var/log/jenkins/reproducible-race-conditions.log /var/log/jenkins/reproducible-diskspace-issues.log /var/log/jenkins/reproducible-remote-error.log; do if [ -s $PROBLEM ] ; then TMPFILE=$(mktemp --tmpdir=$TEMPDIR maintenance-XXXXXXXXXXXX) mv $PROBLEM $TMPFILE |