diff options
| -rwxr-xr-x | bin/reproducible_common.sh | 3 | ||||
| -rwxr-xr-x | bin/reproducible_maintenance.sh | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index 99acef4f..c660d3a5 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -9,6 +9,7 @@ # define db PACKAGES_DB=/var/lib/jenkins/reproducible.db INIT=/var/lib/jenkins/reproducible.init +MAINNODE="jenkins" # host which contains reproducible.db if [ -f $PACKAGES_DB ] && [ -f $INIT ] ; then if [ -f ${PACKAGES_DB}.lock ] ; then for i in $(seq 0 200) ; do @@ -23,7 +24,7 @@ if [ -f $PACKAGES_DB ] && [ -f $INIT ] ; then exit 1 fi fi -elif [ ! -f ${PACKAGES_DB} ] && [ "$HOSTNAME" = "jenkins" ] ; then +elif [ ! -f ${PACKAGES_DB} ] && [ "$HOSTNAME" = "$MAINNODE" ] ; then echo "Warning: $PACKAGES_DB doesn't exist, creating it now." /srv/jenkins/bin/reproducible_db_maintenance.py # 60 seconds timeout when trying to get a lock diff --git a/bin/reproducible_maintenance.sh b/bin/reproducible_maintenance.sh index 0fd38938..d466d2eb 100755 --- a/bin/reproducible_maintenance.sh +++ b/bin/reproducible_maintenance.sh @@ -15,7 +15,7 @@ DIRTY=false REP_RESULTS=/srv/reproducible-results # backup db -if [ "$HOSTNAME" = "jenkins" ] ; then +if [ "$HOSTNAME" = "$MAINNODE" ] ; then echo "$(date -u) - backup db and update public copy." # prepare backup mkdir -p $REP_RESULTS/backup @@ -72,7 +72,7 @@ for s in $SUITES ; do # pbuilder update # # pbuilder aint used on jenkins anymore - if [ "$(hostname)" = "jenkins" ] ; then + if [ "$HOSTNAME" = "$MAINNODE" ] ; then continue else echo "$(date -u) - updating pbuilder for $s/$ARCH now." @@ -140,7 +140,7 @@ if [ ! -z "$OLDSTUFF" ] ; then DIRTY=true fi -if [ "$HOSTNAME" = "jenkins" ] ; then +if [ "$HOSTNAME" = "$MAINNODE" ] ; then # # find failed builds due to network problems and reschedule them # @@ -337,7 +337,7 @@ if [ ! -z "$BADPERMS" ] ; then fi # once a day, send mail about stale builds -if [ "$HOSTNAME" = "jenkins" ] && [ $(date -u +%H) -eq 0 ] ; then +if [ "$HOSTNAME" = "$MAINNODE" ] && [ $(date -u +%H) -eq 0 ] ; then if [ -s /var/lib/jenkins/stale_builds.txt ] ; then TMPFILE=$(mktemp --tmpdir=$TEMPDIR maintenance-XXXXXXXXXXXX) mv /var/lib/jenkins/stale_builds.txt $TMPFILE |