diff options
| -rw-r--r-- | README | 2 | ||||
| -rwxr-xr-x | bin/maintainance.sh (renamed from bin/housekeeping.sh) | 6 | ||||
| -rwxr-xr-x | bin/reproducible_maintainance.sh (renamed from bin/reproducible_housekeeping.sh) | 0 | ||||
| -rwxr-xr-x | job-cfg/chroot-installation.yaml.py | 28 | ||||
| -rw-r--r-- | job-cfg/d-i.yaml | 6 | ||||
| -rw-r--r-- | job-cfg/g-i-installation.yaml | 10 | ||||
| -rw-r--r-- | job-cfg/reproducible.yaml | 8 | ||||
| -rw-r--r-- | job-cfg/self.yaml | 20 |
8 files changed, 40 insertions, 40 deletions
@@ -67,7 +67,7 @@ Installation tests with g-i, the graphical version of d-i, the debian-installer. Installation tests inside chroot environments. -* 'chroot-installation_housekeeping_$distro': +* 'chroot-installation_maintainance_$distro': ** make sure chroots have been cleaned up properly ** runs daily at 05:00 UTC and triggers the $distro specific bootstrap job on success ** wheezy is only triggered on the 4th day and 18th of each month (as it was released on the 4th) diff --git a/bin/housekeeping.sh b/bin/maintainance.sh index 91430011..85629757 100755 --- a/bin/housekeeping.sh +++ b/bin/maintainance.sh @@ -95,7 +95,7 @@ wait4idle() { echo "Done waiting: $(date)" } -general_housekeeping() { +general_maintainance() { uptime echo @@ -118,10 +118,10 @@ general_housekeeping() { } # -# if $1 is empty, we do general housekeeping, else for some subgroup of all jobs +# if $1 is empty, we do general maintainance, else for some subgroup of all jobs # if [ -z $1 ] ; then - general_housekeeping + general_maintainance report_squid_usage brief else case $1 in diff --git a/bin/reproducible_housekeeping.sh b/bin/reproducible_maintainance.sh index f7682245..f7682245 100755 --- a/bin/reproducible_housekeeping.sh +++ b/bin/reproducible_maintainance.sh diff --git a/job-cfg/chroot-installation.yaml.py b/job-cfg/chroot-installation.yaml.py index 4e8a4da0..e14a41f2 100755 --- a/job-cfg/chroot-installation.yaml.py +++ b/job-cfg/chroot-installation.yaml.py @@ -20,7 +20,7 @@ trigger_times = { 'squeeze': '30 16 25 * *', 'sid': '30 4 * * *' } targets = """ - housekeeping + maintainance bootstrap gnome kde @@ -81,7 +81,7 @@ def get_targets_in_distro(distro, targets): # who gets mail for which target # def get_recipients(target): - if target == 'housekeeping': + if target == 'maintainance': return 'holger@layer-acht.org' # FIXME: this should be jenkins-maintainers@lists.somewhere elif target == 'haskell': return 'jenkins+debian-haskell holger@layer-acht.org pkg-haskell-maintainers@lists.alioth.debian.org' @@ -94,7 +94,7 @@ def get_recipients(target): # views for different targets # def get_view(target, distro): - if target == 'housekeeping': + if target == 'maintainance': return 'jenkins.d.n' elif target == 'haskell': return 'haskell' @@ -183,17 +183,17 @@ print(""" """) for base_distro in sorted(base_distros): for target in sorted(get_targets_in_distro(base_distro, targets)): - if target in ('bootstrap', 'housekeeping'): + if target in ('bootstrap', 'maintainance'): action = target else: action = 'install_'+target - if target == 'housekeeping' or base_distro != oldstable: + if target == 'maintainance' or base_distro != oldstable: print("""- job-template: defaults: chroot-installation name: '{name}_%(base_distro)s_%(action)s'""" % dict(base_distro=base_distro, action=action)) - if base_distro in distro_upgrades and action != 'housekeeping': + if base_distro in distro_upgrades and action != 'maintainance': print("""- job-template: defaults: chroot-installation name: '{name}_%(base_distro)s_%(action)s_upgrade_to_%(second_base)s'""" % @@ -208,9 +208,9 @@ print(""" jobs:""") for base_distro in sorted(base_distros): for target in sorted(get_targets_in_distro(base_distro, targets)): - if target == 'housekeeping': - description = 'Housekeeping job for chroot-installation_'+base_distro+'_* jobs, do some cleanups and monitoring so that there is a predictable environment.' - shell = '/srv/jenkins/bin/housekeeping.sh chroot-installation_'+base_distro + if target == 'maintainance': + description = 'Maintainance job for chroot-installation_'+base_distro+'_* jobs, do some cleanups and monitoring so that there is a predictable environment.' + shell = '/srv/jenkins/bin/maintainance.sh chroot-installation_'+base_distro prio = 135 time = trigger_times[base_distro] if base_distro in distro_upgrades.values(): @@ -227,7 +227,7 @@ for base_distro in sorted(base_distros): time = '' trigger = '' for trigger_target in get_targets_in_distro(base_distro, targets): - if trigger_target not in ('housekeeping', 'bootstrap'): + if trigger_target not in ('maintainance', 'bootstrap'): if trigger != '': trigger = trigger+', ' trigger = trigger+'chroot-installation_'+base_distro+'_install_'+trigger_target @@ -237,11 +237,11 @@ for base_distro in sorted(base_distros): prio = 130 time = '' trigger = '' - if target in ('bootstrap', 'housekeeping'): + if target in ('bootstrap', 'maintainance'): action = target else: action = 'install_'+target - if target == 'housekeeping' or base_distro != oldstable: + if target == 'maintainance' or base_distro != oldstable: print(""" - '{name}_%(base_distro)s_%(action)s': my_shell: '%(shell)s' my_prio: '%(prio)s' @@ -259,13 +259,13 @@ for base_distro in sorted(base_distros): recipients=get_recipients(target), view=get_view(target, base_distro), description=description)) - if base_distro in distro_upgrades and action != 'housekeeping': + if base_distro in distro_upgrades and action != 'maintainance': if target == 'bootstrap': shell = '/srv/jenkins/bin/chroot-installation.sh '+base_distro+' none '+distro_upgrades[base_distro] description = 'Debootstrap '+base_distro+', then upgrade to '+distro_upgrades[base_distro]+'.' trigger = '' for trigger_target in get_targets_in_distro(base_distro, targets): - if trigger_target not in ('housekeeping', 'bootstrap'): + if trigger_target not in ('maintainance', 'bootstrap'): if trigger != '': trigger = trigger+', ' trigger = trigger+'chroot-installation_'+base_distro+'_install_'+trigger_target+'_upgrade_to_'+distro_upgrades[base_distro] diff --git a/job-cfg/d-i.yaml b/job-cfg/d-i.yaml index ade704bb..2adcf515 100644 --- a/job-cfg/d-i.yaml +++ b/job-cfg/d-i.yaml @@ -327,7 +327,7 @@ - job-template: defaults: d-i - name: '{name}_housekeeping' + name: '{name}_maintainance' description: 'Cleanup and monitor so that there is a predictable environment.{do_not_edit}' properties: - sidebar: @@ -347,7 +347,7 @@ triggers: - timed: "30 5 * * *" builders: - - shell: '/srv/jenkins/bin/housekeeping.sh {name}' + - shell: '/srv/jenkins/bin/maintainance.sh {name}' publishers: - logparser: parse-rules: '/srv/jenkins/logparse/debian.rules' @@ -814,7 +814,7 @@ name: d-i do_not_edit: '<br><br>Job configuration source is <a href="http://anonscm.debian.org/cgit/qa/jenkins.debian.net.git/job-cfg/d-i.yaml">d-i.yaml</a>.' jobs: - - '{name}_housekeeping' + - '{name}_maintainance' - '{name}_check_jenkins_jobs' - '{name}_manual': include: '/trunk/manual/debian/.* diff --git a/job-cfg/g-i-installation.yaml b/job-cfg/g-i-installation.yaml index 40f5de9a..44897f4c 100644 --- a/job-cfg/g-i-installation.yaml +++ b/job-cfg/g-i-installation.yaml @@ -53,7 +53,7 @@ categories: - g-i-installation - defaults: - name: g-i-installation-housekeeping + name: g-i-installation-maintainance description: 'Cleanup and monitor so that there is a predictable environment.{do_not_edit}' logrotate: daysToKeep: 90 @@ -63,7 +63,7 @@ triggers: - timed: "0 6 * * *" builders: - - shell: '/srv/jenkins/bin/housekeeping.sh {name}' + - shell: '/srv/jenkins/bin/maintainance.sh {name}' publishers: - logparser: parse-rules: '/srv/jenkins/logparse/debian.rules' @@ -88,8 +88,8 @@ job-prio: '175' - job-template: - defaults: g-i-installation-housekeeping - name: '{name}_housekeeping' + defaults: g-i-installation-maintainance + name: '{name}_maintainance' - job-template: defaults: g-i-installation @@ -287,7 +287,7 @@ name: g-i-installation do_not_edit: '<br><br>Job configuration source is <a href="http://anonscm.debian.org/cgit/qa/jenkins.debian.net.git/job-cfg/g-i-installation.yaml">g-i-installation.yaml</a>.' jobs: - - '{name}_housekeeping' + - '{name}_maintainance' - '{name}_debian-edu_wheezy-test_minimal': my_title: 'Debian Edu (wheezy-test) minimal' my_shell: '/srv/jenkins/bin/g-i-installation.sh 25 http://ftp.skolelinux.org/cd-wheezy-test-amd64-i386-netinst/debian-edu-amd64-i386-NETINST-1.iso' diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml index 7b4dbfc0..23144ff6 100644 --- a/job-cfg/reproducible.yaml +++ b/job-cfg/reproducible.yaml @@ -118,7 +118,7 @@ - job-template: defaults: reproducible - name: '{name}_housekeeping' + name: '{name}_maintainance' - job-template: defaults: reproducible @@ -174,10 +174,10 @@ - project: name: reproducible jobs: - - '{name}_housekeeping': - my_description: 'Do some housekeeping, check no old directories are laying around, do backups, etc.' + - '{name}_maintainance': + my_description: 'Do some maintainance, check no old directories are laying around, do backups, etc.' my_timed: '0 12 * * *' - my_shell: '/srv/jenkins/bin/reproducible_housekeeping.sh' + my_shell: '/srv/jenkins/bin/reproducible_maintainance.sh' my_recipients: 'holger@layer-acht.org' - '{name}_setup_pbuilder': my_description: 'Setup pbuilder for reproducible builds as described in https://wiki.debian.org/ReproducibleBuilds#Usage_example' diff --git a/job-cfg/self.yaml b/job-cfg/self.yaml index 000e21d6..331e19cb 100644 --- a/job-cfg/self.yaml +++ b/job-cfg/self.yaml @@ -1,5 +1,5 @@ - defaults: - name: self-housekeeping + name: self-maintainance description: 'Cleanup and monitor so that there is a predictable environment.{do_not_edit}' logrotate: daysToKeep: 90 @@ -20,7 +20,7 @@ icon: /userContent/images/debian-swirl-24x24.png - sidebar: url: https://jenkins.debian.net/view/jenkins.d.n/ - text: Housekeeping jobs + text: All jenkins.d.n jobs icon: /userContent/images/debian-jenkins-24x24.png - sidebar: url: http://www.profitbricks.com @@ -30,8 +30,8 @@ job-prio: '125' - job-template: - defaults: self-housekeeping - name: '{name}_housekeeping' + defaults: self-maintainance + name: '{name}_maintainance' publishers: - logparser: parse-rules: '/srv/jenkins/logparse/debian.rules' @@ -39,15 +39,15 @@ fail-on-error: 'true' - job-template: - defaults: self-housekeeping - name: '{name}_sub-housekeeping-squid' + defaults: self-maintainance + name: '{name}_sub-maintainance-squid' - project: name: self do_not_edit: '<br><br>Job configuration source is <a href="http://anonscm.debian.org/cgit/qa/jenkins.debian.net.git/job-cfg/self.yaml">self.yaml</a>.' jobs: - - '{name}_housekeeping': - my_shell: '/srv/jenkins/bin/housekeeping.sh' - - '{name}_sub-housekeeping-squid': - my_shell: '/srv/jenkins/bin/housekeeping.sh squid' + - '{name}_maintainance': + my_shell: '/srv/jenkins/bin/maintainance.sh' + - '{name}_sub-maintainance-squid': + my_shell: '/srv/jenkins/bin/maintainance.sh squid' |