Commit bcc697c4 authored by Holger Levsen's avatar Holger Levsen

fix language: s#maintainance#maintenance#g

parent 35272983
...@@ -69,7 +69,7 @@ Installation tests with g-i, the graphical version of d-i, the debian-installer. ...@@ -69,7 +69,7 @@ Installation tests with g-i, the graphical version of d-i, the debian-installer.
Installation tests inside chroot environments. Installation tests inside chroot environments.
* 'chroot-installation_maintainance_$distro': * 'chroot-installation_maintenance_$distro':
** make sure chroots have been cleaned up properly ** make sure chroots have been cleaned up properly
** runs daily at 05:00 UTC and triggers the $distro specific bootstrap job on success ** 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) ** wheezy is only triggered on the 4th day and 18th of each month (as it was released on the 4th)
......
...@@ -18,7 +18,6 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian ...@@ -18,7 +18,6 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
== General ToDo == General ToDo
* rename maintainance jobs into maintenance jobs
* replace amd64 in scripts with $HOSTARCH * replace amd64 in scripts with $HOSTARCH
* put kgb-client.conf in git and sed passwords from filesystem into it... * put kgb-client.conf in git and sed passwords from filesystem into it...
* move this setup to jenkins.d.o * move this setup to jenkins.d.o
...@@ -130,7 +129,7 @@ properties: ...@@ -130,7 +129,7 @@ properties:
** meld bin/reproducible_setup_schroot.sh into bin/schroot-create.sh and alias the former to the latter ** meld bin/reproducible_setup_schroot.sh into bin/schroot-create.sh and alias the former to the latter
** "fork" etc/schroot/default into etc/schroot/reproducible ** "fork" etc/schroot/default into etc/schroot/reproducible
** use one css for all, not two minimally different ones ** use one css for all, not two minimally different ones
** restore the "find packages which have been removed from sid" part of reproducible_maintainance.sh ** restore the "find packages which have been removed from sid" part of reproducible_maintenance.sh
** repo-comparison: check for binaries without source ** repo-comparison: check for binaries without source
** turn job-cfg/g-i.yaml into .yaml.py ** turn job-cfg/g-i.yaml into .yaml.py
......
...@@ -1080,7 +1080,7 @@ monitor_system() { ...@@ -1080,7 +1080,7 @@ monitor_system() {
echo "ERROR: An installation step failed." >> $GOCR echo "ERROR: An installation step failed." >> $GOCR
exit 1 exit 1
elif [ ! -z "$ROOT_PROBLEM" ] ; then elif [ ! -z "$ROOT_PROBLEM" ] ; then
echo "ERROR: System is hanging at boot and waiting for root maintainance." >> $GOCR echo "ERROR: System is hanging at boot and waiting for root maintenance." >> $GOCR
exit 1 exit 1
elif [ ! -z "$BUILD_LTSP_PROBLEM" ] ; then elif [ ! -z "$BUILD_LTSP_PROBLEM" ] ; then
echo "ERROR: The failing step is: Build LTSP chroot." >> $GOCR echo "ERROR: The failing step is: Build LTSP chroot." >> $GOCR
......
...@@ -136,7 +136,7 @@ wait4idle() { ...@@ -136,7 +136,7 @@ wait4idle() {
echo "Done waiting: $(date)" echo "Done waiting: $(date)"
} }
general_maintainance() { general_maintenance() {
uptime uptime
echo echo
...@@ -159,10 +159,10 @@ general_maintainance() { ...@@ -159,10 +159,10 @@ general_maintainance() {
} }
# #
# if $1 is empty, we do general maintainance, else for some subgroup of all jobs # if $1 is empty, we do general maintenance, else for some subgroup of all jobs
# #
if [ -z $1 ] ; then if [ -z $1 ] ; then
general_maintainance general_maintenance
compress_old_jenkins_logs compress_old_jenkins_logs
report_squid_usage brief report_squid_usage brief
else else
......
...@@ -20,7 +20,7 @@ trigger_times = { 'squeeze': '30 16 25 * *', ...@@ -20,7 +20,7 @@ trigger_times = { 'squeeze': '30 16 25 * *',
'sid': '30 4 * * *' } 'sid': '30 4 * * *' }
targets = """ targets = """
maintainance maintenance
bootstrap bootstrap
gnome gnome
kde kde
...@@ -84,7 +84,7 @@ def get_targets_in_distro(distro, targets): ...@@ -84,7 +84,7 @@ def get_targets_in_distro(distro, targets):
# who gets mail for which target # who gets mail for which target
# #
def get_recipients(target): def get_recipients(target):
if target == 'maintainance': if target == 'maintenance':
return 'qa-jenkins-scm@lists.alioth.debian.org' return 'qa-jenkins-scm@lists.alioth.debian.org'
elif target == 'haskell': elif target == 'haskell':
return 'jenkins+debian-haskell qa-jenkins-scm@lists.alioth.debian.org pkg-haskell-maintainers@lists.alioth.debian.org' return 'jenkins+debian-haskell qa-jenkins-scm@lists.alioth.debian.org pkg-haskell-maintainers@lists.alioth.debian.org'
...@@ -103,7 +103,7 @@ def get_recipients(target): ...@@ -103,7 +103,7 @@ def get_recipients(target):
# views for different targets # views for different targets
# #
def get_view(target, distro): def get_view(target, distro):
if target == 'maintainance': if target == 'maintenance':
return 'jenkins.d.n' return 'jenkins.d.n'
elif target == 'haskell': elif target == 'haskell':
return 'haskell' return 'haskell'
...@@ -198,19 +198,19 @@ print(""" ...@@ -198,19 +198,19 @@ print("""
""") """)
for base_distro in sorted(base_distros): for base_distro in sorted(base_distros):
for target in sorted(get_targets_in_distro(base_distro, targets)): for target in sorted(get_targets_in_distro(base_distro, targets)):
if target in ('bootstrap', 'maintainance'): if target in ('bootstrap', 'maintenance'):
action = target action = target
else: else:
action = 'install_'+target action = 'install_'+target
# default job # default job
if target == 'maintainance' or base_distro != oldstable: if target == 'maintenance' or base_distro != oldstable:
print("""- job-template: print("""- job-template:
defaults: chroot-installation defaults: chroot-installation
name: '{name}_%(base_distro)s_%(action)s'""" % name: '{name}_%(base_distro)s_%(action)s'""" %
dict(base_distro=base_distro, dict(base_distro=base_distro,
action=action)) action=action))
# upgrade job # upgrade job
if base_distro in distro_upgrades and action != 'maintainance': if base_distro in distro_upgrades and action != 'maintenance':
print("""- job-template: print("""- job-template:
defaults: chroot-installation defaults: chroot-installation
name: '{name}_%(base_distro)s_%(action)s_upgrade_to_%(second_base)s'""" % name: '{name}_%(base_distro)s_%(action)s_upgrade_to_%(second_base)s'""" %
...@@ -218,7 +218,7 @@ for base_distro in sorted(base_distros): ...@@ -218,7 +218,7 @@ for base_distro in sorted(base_distros):
action=action, action=action,
second_base=distro_upgrades[base_distro])) second_base=distro_upgrades[base_distro]))
# upgrade job with upgrading apt+dpkg first # upgrade job with upgrading apt+dpkg first
if base_distro in distro_upgrades and base_distro != oldstable and target[:10] != 'education-' and action != 'maintainance': if base_distro in distro_upgrades and base_distro != oldstable and target[:10] != 'education-' and action != 'maintenance':
print("""- job-template: print("""- job-template:
defaults: chroot-installation defaults: chroot-installation
name: '{name}_%(base_distro)s_%(action)s_upgrade_to_%(second_base)s_aptdpkg_first'""" % name: '{name}_%(base_distro)s_%(action)s_upgrade_to_%(second_base)s_aptdpkg_first'""" %
...@@ -233,9 +233,9 @@ print(""" ...@@ -233,9 +233,9 @@ print("""
jobs:""") jobs:""")
for base_distro in sorted(base_distros): for base_distro in sorted(base_distros):
for target in sorted(get_targets_in_distro(base_distro, targets)): for target in sorted(get_targets_in_distro(base_distro, targets)):
if target == 'maintainance': if target == 'maintenance':
description = 'Maintainance job for chroot-installation_'+base_distro+'_* jobs, do some cleanups and monitoring so that there is a predictable environment.' 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 shell = '/srv/jenkins/bin/maintenance.sh chroot-installation_'+base_distro
prio = 135 prio = 135
time = trigger_times[base_distro] time = trigger_times[base_distro]
if base_distro in distro_upgrades.values(): if base_distro in distro_upgrades.values():
...@@ -252,7 +252,7 @@ for base_distro in sorted(base_distros): ...@@ -252,7 +252,7 @@ for base_distro in sorted(base_distros):
time = '' time = ''
trigger = '' trigger = ''
for trigger_target in get_targets_in_distro(base_distro, targets): for trigger_target in get_targets_in_distro(base_distro, targets):
if trigger_target not in ('maintainance', 'bootstrap'): if trigger_target not in ('maintenance', 'bootstrap'):
if trigger != '': if trigger != '':
trigger = trigger+', ' trigger = trigger+', '
trigger = trigger+'chroot-installation_'+base_distro+'_install_'+trigger_target trigger = trigger+'chroot-installation_'+base_distro+'_install_'+trigger_target
...@@ -262,12 +262,12 @@ for base_distro in sorted(base_distros): ...@@ -262,12 +262,12 @@ for base_distro in sorted(base_distros):
prio = 130 prio = 130
time = '' time = ''
trigger = '' trigger = ''
if target in ('bootstrap', 'maintainance'): if target in ('bootstrap', 'maintenance'):
action = target action = target
else: else:
action = 'install_'+target action = 'install_'+target
# default job # default job
if target == 'maintainance' or base_distro != oldstable: if target == 'maintenance' or base_distro != oldstable:
print(""" - '{name}_%(base_distro)s_%(action)s': print(""" - '{name}_%(base_distro)s_%(action)s':
my_shell: '%(shell)s' my_shell: '%(shell)s'
my_prio: '%(prio)s' my_prio: '%(prio)s'
...@@ -286,13 +286,13 @@ for base_distro in sorted(base_distros): ...@@ -286,13 +286,13 @@ for base_distro in sorted(base_distros):
view=get_view(target, base_distro), view=get_view(target, base_distro),
description=description)) description=description))
# upgrade job # upgrade job
if base_distro in distro_upgrades and action != 'maintainance': if base_distro in distro_upgrades and action != 'maintenance':
if target == 'bootstrap': if target == 'bootstrap':
shell = '/srv/jenkins/bin/chroot-installation.sh '+base_distro+' none '+distro_upgrades[base_distro] 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]+'.' description = 'Debootstrap '+base_distro+', then upgrade to '+distro_upgrades[base_distro]+'.'
trigger = '' trigger = ''
for trigger_target in get_targets_in_distro(base_distro, targets): for trigger_target in get_targets_in_distro(base_distro, targets):
if trigger_target not in ('maintainance', 'bootstrap'): if trigger_target not in ('maintenance', 'bootstrap'):
if trigger != '': if trigger != '':
trigger = trigger+', ' trigger = trigger+', '
trigger = trigger+'chroot-installation_'+base_distro+'_install_'+trigger_target+'_upgrade_to_'+distro_upgrades[base_distro] trigger = trigger+'chroot-installation_'+base_distro+'_install_'+trigger_target+'_upgrade_to_'+distro_upgrades[base_distro]
...@@ -318,12 +318,12 @@ for base_distro in sorted(base_distros): ...@@ -318,12 +318,12 @@ for base_distro in sorted(base_distros):
second_base=distro_upgrades[base_distro], second_base=distro_upgrades[base_distro],
description=description)) description=description))
# upgrade job with upgrading apt+dpkg first # upgrade job with upgrading apt+dpkg first
if base_distro in distro_upgrades and base_distro != oldstable and target[:10] != 'education-' and action != 'maintainance': if base_distro in distro_upgrades and base_distro != oldstable and target[:10] != 'education-' and action != 'maintenance':
description = 'Debootstrap '+base_distro+', then upgrade apt and dpkg to '+distro_upgrades[base_distro]+' and then everything else.' description = 'Debootstrap '+base_distro+', then upgrade apt and dpkg to '+distro_upgrades[base_distro]+' and then everything else.'
if target == 'bootstrap': if target == 'bootstrap':
trigger = '' trigger = ''
for trigger_target in get_targets_in_distro(base_distro, targets): for trigger_target in get_targets_in_distro(base_distro, targets):
if trigger_target not in ('maintainance', 'bootstrap'): if trigger_target not in ('maintenance', 'bootstrap'):
if trigger != '': if trigger != '':
trigger = trigger+', ' trigger = trigger+', '
trigger = trigger+'chroot-installation_'+base_distro+'_install_'+trigger_target+'_upgrade_to_'+distro_upgrades[base_distro]+'_aptdpkg_first' trigger = trigger+'chroot-installation_'+base_distro+'_install_'+trigger_target+'_upgrade_to_'+distro_upgrades[base_distro]+'_aptdpkg_first'
......
...@@ -323,7 +323,7 @@ ...@@ -323,7 +323,7 @@
- job-template: - job-template:
defaults: d-i defaults: d-i
name: '{name}_maintainance' name: '{name}_maintenance'
description: 'Cleanup and monitor so that there is a predictable environment.{do_not_edit}' description: 'Cleanup and monitor so that there is a predictable environment.{do_not_edit}'
properties: properties:
- sidebar: - sidebar:
...@@ -343,7 +343,7 @@ ...@@ -343,7 +343,7 @@
triggers: triggers:
- timed: '30 5 * * *' - timed: '30 5 * * *'
builders: builders:
- shell: '/srv/jenkins/bin/maintainance.sh {name}' - shell: '/srv/jenkins/bin/maintenance.sh {name}'
publishers: publishers:
- logparser: - logparser:
parse-rules: '/srv/jenkins/logparse/debian.rules' parse-rules: '/srv/jenkins/logparse/debian.rules'
...@@ -804,7 +804,7 @@ ...@@ -804,7 +804,7 @@
name: d-i name: d-i
do_not_edit: '<br><br>Job configuration source is <a href="http://anonscm.debian.org/cgit/qa/jenkins.debian.net.git/tree/job-cfg/d-i.yaml">d-i.yaml</a>.' do_not_edit: '<br><br>Job configuration source is <a href="http://anonscm.debian.org/cgit/qa/jenkins.debian.net.git/tree/job-cfg/d-i.yaml">d-i.yaml</a>.'
jobs: jobs:
- '{name}_maintainance' - '{name}_maintenance'
- '{name}_check_jenkins_jobs' - '{name}_check_jenkins_jobs'
- '{name}_manual': - '{name}_manual':
include: '/trunk/manual/debian/.* include: '/trunk/manual/debian/.*
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
categories: categories:
- g-i-installation - g-i-installation
- defaults: - defaults:
name: g-i-installation-maintainance name: g-i-installation-maintenance
description: 'Cleanup and monitor so that there is a predictable environment.{do_not_edit}' description: 'Cleanup and monitor so that there is a predictable environment.{do_not_edit}'
logrotate: logrotate:
daysToKeep: 90 daysToKeep: 90
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
triggers: triggers:
- timed: "0 6 * * *" - timed: "0 6 * * *"
builders: builders:
- shell: '/srv/jenkins/bin/maintainance.sh {name}' - shell: '/srv/jenkins/bin/maintenance.sh {name}'
publishers: publishers:
- logparser: - logparser:
parse-rules: '/srv/jenkins/logparse/debian.rules' parse-rules: '/srv/jenkins/logparse/debian.rules'
...@@ -94,8 +94,8 @@ ...@@ -94,8 +94,8 @@
job-prio: '175' job-prio: '175'
- job-template: - job-template:
defaults: g-i-installation-maintainance defaults: g-i-installation-maintenance
name: '{name}_maintainance' name: '{name}_maintenance'
- job-template: - job-template:
defaults: g-i-installation defaults: g-i-installation
...@@ -325,7 +325,7 @@ ...@@ -325,7 +325,7 @@
name: g-i-installation 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/tree/job-cfg/g-i-installation.yaml">g-i-installation.yaml</a>.' do_not_edit: '<br><br>Job configuration source is <a href="http://anonscm.debian.org/cgit/qa/jenkins.debian.net.git/tree/job-cfg/g-i-installation.yaml">g-i-installation.yaml</a>.'
jobs: jobs:
- '{name}_maintainance' - '{name}_maintenance'
- '{name}_debian-edu_wheezy_minimal': - '{name}_debian-edu_wheezy_minimal':
my_title: 'Debian Edu (wheezy) minimal' my_title: 'Debian Edu (wheezy) minimal'
my_shell: '/srv/jenkins/bin/g-i-installation.sh 25 http://ftp.skolelinux.org/cd-wheezy-amd64-i386-netinst/debian-edu-amd64-i386-NETINST-1.iso' my_shell: '/srv/jenkins/bin/g-i-installation.sh 25 http://ftp.skolelinux.org/cd-wheezy-amd64-i386-netinst/debian-edu-amd64-i386-NETINST-1.iso'
......
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
- job-template: - job-template:
defaults: reproducible defaults: reproducible
name: '{name}_maintainance' name: '{name}_maintenance'
- job-template: - job-template:
defaults: reproducible defaults: reproducible
...@@ -224,10 +224,10 @@ ...@@ -224,10 +224,10 @@
- project: - project:
name: reproducible name: reproducible
jobs: jobs:
- '{name}_maintainance': - '{name}_maintenance':
my_description: 'Do some maintainance: check for old directories laying around, do backups, etc.' my_description: 'Do some maintenance: check for old directories laying around, do backups, etc.'
my_timed: '5 0,4,8,12,16,20 * * *' my_timed: '5 0,4,8,12,16,20 * * *'
my_shell: '/srv/jenkins/bin/reproducible_maintainance.sh' my_shell: '/srv/jenkins/bin/reproducible_maintenance.sh'
my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org' my_recipients: 'qa-jenkins-scm@lists.alioth.debian.org'
- '{name}_setup_pbuilder_testing': - '{name}_setup_pbuilder_testing':
my_description: 'Setup and update pbuilder for reproducible builds of packages from testing as described in https://wiki.debian.org/ReproducibleBuilds#Usage_example' my_description: 'Setup and update pbuilder for reproducible builds of packages from testing as described in https://wiki.debian.org/ReproducibleBuilds#Usage_example'
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
icon: /userContent/images/debian-swirl-24x24.png icon: /userContent/images/debian-swirl-24x24.png
- sidebar: - sidebar:
url: https://jenkins.debian.net/view/schroot-maint/ url: https://jenkins.debian.net/view/schroot-maint/
text: schroot maintainance jobs text: schroot maintenance jobs
icon: /userContent/images/debian-jenkins-24x24.png icon: /userContent/images/debian-jenkins-24x24.png
- sidebar: - sidebar:
url: http://www.profitbricks.com url: http://www.profitbricks.com
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
icon: /userContent/images/debian-swirl-24x24.png icon: /userContent/images/debian-swirl-24x24.png
- sidebar: - sidebar:
url: https://jenkins.debian.net/view/schroot-maint/ url: https://jenkins.debian.net/view/schroot-maint/
text: schroot maintainance jobs text: schroot maintenance jobs
icon: /userContent/images/debian-jenkins-24x24.png icon: /userContent/images/debian-jenkins-24x24.png
- sidebar: - sidebar:
url: http://www.profitbricks.com url: http://www.profitbricks.com
......
- defaults: - defaults:
name: self-maintainance name: self-maintenance
description: 'Cleanup and monitor so that there is a predictable environment.{do_not_edit}' description: 'Cleanup and monitor so that there is a predictable environment.{do_not_edit}'
logrotate: logrotate:
daysToKeep: 90 daysToKeep: 90
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
job-prio: '125' job-prio: '125'
- job-template: - job-template:
defaults: self-maintainance defaults: self-maintenance
name: '{name}_maintainance' name: '{name}_maintenance'
publishers: publishers:
- logparser: - logparser:
parse-rules: '/srv/jenkins/logparse/debian.rules' parse-rules: '/srv/jenkins/logparse/debian.rules'
...@@ -39,21 +39,21 @@ ...@@ -39,21 +39,21 @@
fail-on-error: 'true' fail-on-error: 'true'
- job-template: - job-template:
defaults: self-maintainance defaults: self-maintenance
name: '{name}_sub-maintainance' name: '{name}_sub-maintenance'
defaults: self-maintainance defaults: self-maintenance
name: '{name}_sub-maintainance-squid' name: '{name}_sub-maintenance-squid'
defaults: self-maintainance defaults: self-maintenance
name: 'rebootstrap_maintainance' name: 'rebootstrap_maintenance'
- project: - project:
name: self name: self
do_not_edit: '<br><br>Job configuration source is <a href="http://anonscm.debian.org/cgit/qa/jenkins.debian.net.git/tree/job-cfg/self.yaml">self.yaml</a>.' do_not_edit: '<br><br>Job configuration source is <a href="http://anonscm.debian.org/cgit/qa/jenkins.debian.net.git/tree/job-cfg/self.yaml">self.yaml</a>.'
jobs: jobs:
- '{name}_maintainance': - '{name}_maintenance':
my_shell: '/srv/jenkins/bin/maintainance.sh' my_shell: '/srv/jenkins/bin/maintenance.sh'
- '{name}_sub-maintainance-squid': - '{name}_sub-maintenance-squid':
my_shell: '/srv/jenkins/bin/maintainance.sh squid' my_shell: '/srv/jenkins/bin/maintenance.sh squid'
- 'rebootstrap_maintainance': - 'rebootstrap_maintenance':
my_shell: '/srv/jenkins/bin/maintainance.sh rebootstrap' my_shell: '/srv/jenkins/bin/maintenance.sh rebootstrap'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment