diff options
| -rwxr-xr-x | bin/housekeeping.sh | 6 | ||||
| -rw-r--r-- | job-cfg/chroot-installation.yaml | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/bin/housekeeping.sh b/bin/housekeeping.sh index b03e16e0..5b8ef433 100755 --- a/bin/housekeeping.sh +++ b/bin/housekeeping.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2012 Holger Levsen <holger@layer-acht.org> +# Copyright 2012-2013 Holger Levsen <holger@layer-acht.org> # released under the GPLv=2 # @@ -21,7 +21,7 @@ check_for_mounted_chroots() { echo "$ ls -la $CHROOT_PATTERN" # List the processes using the partition echo - fuser -mv $CHROOT_TARGET + fuser -mv $CHROOT_PATTERN cat $OUTPUT rm $OUTPUT exit 1 @@ -97,7 +97,7 @@ if [ -z $1 ] ; then report_squid_usage brief else case $1 in - chroot-installation) wait4idle $1 + chroot-installation*) wait4idle $1 report_disk_usage $1 check_for_mounted_chroots $1 ;; diff --git a/job-cfg/chroot-installation.yaml b/job-cfg/chroot-installation.yaml index db712bc8..7443a8ba 100644 --- a/job-cfg/chroot-installation.yaml +++ b/job-cfg/chroot-installation.yaml @@ -78,7 +78,7 @@ triggers: - timed: '{my_time}' builders: - - shell: '/srv/jenkins/bin/housekeeping.sh {name}' + - shell: '/srv/jenkins/bin/housekeeping.sh {my_prefix}' publishers: - logparser: parse-rules: '/srv/jenkins/logparse/debian.rules' @@ -454,19 +454,23 @@ my_description: 'Cleanup and monitor so that there is a predictable environment.' my_trigger: 'chroot-installation_squeeze_bootstrap, chroot-installation_squeeze_bootstrap_upgrade_to_wheezy' my_time: '0 5 25 * *' + my_prefix: '{name}_housekeeping_squeeze' - '{name}_housekeeping_wheezy': my_description: 'Cleanup and monitor so that there is a predictable environment.' my_trigger: 'chroot-installation_wheezy_bootstrap' my_time: '0 5 4,18 * *' + my_prefix: '{name}_housekeeping_wheezy' - '{name}_housekeeping_jessie': my_description: 'Cleanup and monitor so that there is a predictable environment.' my_trigger: 'chroot-installation_jessie_bootstrap, chroot-installation_wheezy_bootstrap_upgrade_to_jessie' my_time: '0 10 * * *' + my_prefix: '{name}_housekeeping_jessie' - '{name}_housekeeping_sid': my_description: 'Cleanup and monitor so that there is a predictable environment.' my_trigger: 'chroot-installation_sid_bootstrap' my_time: '0 5 * * *' + my_prefix: '{name}_housekeeping_sid' |