add three new housekeeping jobs

4 files changed, 102 insertions, 2 deletions

diff --git a/job-cfg/chroot-installation.yaml b/job-cfg/chroot-installation.yaml
index c55a75c4..c53d1c10 100644
--- a/job-cfg/chroot-installation.yaml
+++ b/job-cfg/chroot-installation.yaml
@@ -70,7 +70,7 @@
     triggers:
       - timed: "0 5 * * *"
     builders:
-      - shell: '/srv/jenkins/bin/housekeeping.sh'
+      - shell: '/srv/jenkins/bin/housekeeping.sh {name}'
     publishers:
       - logparser:
           rulespath: '/srv/jenkins/logparse/debian.rules'
@@ -258,6 +258,6 @@
          my_trigger: 'chroot-installation_wheezy_install_gnome, chroot-installation_wheezy_install_kde, chroot-installation_wheezy_install_lxde, chroot-installation_wheezy_install_xfce, chroot-installation_wheezy_install_full_desktop, chroot-installation_wheezy_install_developer'
 
       - '{name}_housekeeping':
-         my_description: 'Cleanup so that there is a predictable environment.'
+         my_description: 'Cleanup and monitor so that there is a predictable environment.'
          my_trigger: 'chroot-installation_sid_bootstrap, chroot-installation_wheezy_bootstrap, chroot-installation_squeeze_bootstrap_upgrade_to_wheezy'
 
diff --git a/job-cfg/d-i.yaml b/job-cfg/d-i.yaml
index 2dafa2bd..e1cf9baf 100644
--- a/job-cfg/d-i.yaml
+++ b/job-cfg/d-i.yaml
@@ -322,6 +322,22 @@
           recipients: holger@layer-acht.org
 
 - job-template:
+    defaults: d-i
+    name: '{name}_housekeeping'
+    description: 'Cleanup and monitor so that there is a predictable environment.{do_not_edit}'
+    triggers:
+      - timed: "30 5 * * *"
+    builders:
+      - shell: '/srv/jenkins/bin/housekeeping.sh {name}'
+    publishers:
+      - logparser:
+          rulespath: '/srv/jenkins/logparse/debian.rules'
+          unstable_on_warning: 'true'
+          fail_on_error: 'true'
+      - email:
+          recipients: jenkins+debian-boot holger@layer-acht.org
+
+- job-template:
     defaults: d-i-manual-html
     name: '{name}_manual_ca_html'
 - job-template:
@@ -819,6 +835,7 @@
     name: d-i
     do_not_edit: '<br><br>Job configuration source is <a href="http://anonscm.debian.org/gitweb/?p=users/holger/jenkins.debian.net.git;a=blob;f=job-cfg/d-i.yaml">d-i.yaml</a>.'
     jobs:
+      - '{name}_housekeeping'
       - '{name}_parse_build_logs'
       - '{name}_check_jenkins_jobs'
       - '{name}_manual':
diff --git a/job-cfg/g-i-installation.yaml b/job-cfg/g-i-installation.yaml
index 10374da9..945533ea 100644
--- a/job-cfg/g-i-installation.yaml
+++ b/job-cfg/g-i-installation.yaml
@@ -35,6 +35,44 @@
           text: Sponsored by Profitbricks
           icon: /userContent/images/profitbricks-24x24.png
 
+- default:
+    name: g-i-installation-housekeeping
+    description: 'Cleanup and monitor so that there is a predictable environment.{do_not_edit}'
+    logrotate:
+      daysToKeep: 90
+      numToKeep: 25
+      artifactDaysToKeep: -1
+      artifactNumToKeep: -1
+    triggers:
+      - timed: "0 6 * * *"
+    builders:
+      - shell: '/srv/jenkins/bin/housekeeping.sh {name}'
+    publishers:
+      - logparser:
+          rulespath: '/srv/jenkins/logparse/debian.rules'
+          unstable_on_warning: 'true'
+          fail_on_error: 'true'
+      - email:
+          recipients: holger@layer-acht.org
+    properties:
+      - sidebar:
+          url: http://jenkins.debian.net/userContent/about.html
+          text: About jenkins.debian.net
+          icon: /userContent/images/debian-swirl-24x24.png
+      - sidebar:
+          url: http://jenkins.debian.net/view/g-i-installation/
+          text: All g-i-installation jobs
+          icon: /userContent/images/debian-jenkins-24x24.png
+      - sidebar:
+          url: http://www.profitbricks.com
+          text: Sponsored by Profitbricks
+          icon: /userContent/images/profitbricks-24x24.png
+
+
+- job-template:
+    defaults: g-i-installation-housekeeping
+    name: '{name}_housekeeping'
+
 - job-template:
     defaults: g-i-installation
     name: '{name}_debian-edu_wheezy-test_standalone'
@@ -83,6 +121,7 @@
     name: g-i-installation
     do_not_edit: '<br><br>Job configuration source is <a href="http://anonscm.debian.org/gitweb/?p=users/holger/jenkins.debian.net.git;a=blob;f=job-cfg/g-i-installation.yaml">g-i-installation.yaml</a>.'
     jobs:
+      - '{name}_housekeeping'
       - '{name}_debian-edu_wheezy-test_standalone':
          my_shell: '/srv/jenkins/bin/g-i-installation.sh 1 debian-edu_wheezy-test_standalone 25 http://ftp.skolelinux.org/cd-edu-testing-nolocal-netinst/debian-edu-amd64-i386-NETINST-1.iso'
          my_description: 'Do a fully automated installation of a Debian Edu Wheezy standalone profile - via d-i preseeding (with <a href="http://jenkins.debian.net/d-i-preseed-cfgs/debian-edu_wheezy-test_standalone_preseed.cfg">this preseed.cfg</a>) using the netinst CD image.'
diff --git a/job-cfg/self.yaml b/job-cfg/self.yaml
new file mode 100644
index 00000000..9c73e828
--- /dev/null
+++ b/job-cfg/self.yaml
@@ -0,0 +1,44 @@
+- default:
+    name: self-housekeeping
+    description: 'Cleanup and monitor so that there is a predictable environment.{do_not_edit}'
+    logrotate:
+      daysToKeep: 90
+      numToKeep: 25
+      artifactDaysToKeep: -1
+      artifactNumToKeep: -1
+    triggers:
+      - timed: "30 6 * * *"
+    builders:
+      - shell: '/srv/jenkins/bin/housekeeping.sh'
+    publishers:
+      - logparser:
+          rulespath: '/srv/jenkins/logparse/debian.rules'
+          unstable_on_warning: 'true'
+          fail_on_error: 'true'
+      - email:
+          recipients: holger@layer-acht.org
+    properties:
+      - sidebar:
+          url: http://jenkins.debian.net/userContent/about.html
+          text: About jenkins.debian.net
+          icon: /userContent/images/debian-swirl-24x24.png
+      - sidebar:
+          url: http://jenkins.debian.net/view/jenkins.d.n/
+          text: Housekeeping jobs
+          icon: /userContent/images/debian-jenkins-24x24.png
+      - sidebar:
+          url: http://www.profitbricks.com
+          text: Sponsored by Profitbricks
+          icon: /userContent/images/profitbricks-24x24.png
+
+
+- job-template:
+    defaults: self-housekeeping
+    name: '{name}_housekeeping'
+
+- project:
+    name: self
+    do_not_edit: '<br><br>Job configuration source is <a href="http://anonscm.debian.org/gitweb/?p=users/holger/jenkins.debian.net.git;a=blob;f=job-cfg/self.yaml">self.yaml</a>.'
+    jobs:
+      - '{name}_housekeeping'
+