diff options
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | TODO | 3 | ||||
| -rwxr-xr-x | bin/g-i-installation.sh | 2 | ||||
| -rwxr-xr-x | bin/maintenance.sh (renamed from bin/maintainance.sh) | 6 | ||||
| -rwxr-xr-x | bin/reproducible_maintenance.sh (renamed from bin/reproducible_maintainance.sh) | 0 | ||||
| -rwxr-xr-x | job-cfg/chroot-installation.yaml.py | 32 | ||||
| -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/schroot.yaml | 4 | ||||
| -rw-r--r-- | job-cfg/self.yaml | 30 |
11 files changed, 51 insertions, 52 deletions
@@ -69,7 +69,7 @@ Installation tests with g-i, the graphical version of d-i, the debian-installer. Installation tests inside chroot environments. -* 'chroot-installation_maintainance_$distro': +* 'chroot-installation_maintenance_$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) @@ -18,7 +18,6 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian == General ToDo -* rename maintainance jobs into maintenance jobs * replace amd64 in scripts with $HOSTARCH * put kgb-client.conf in git and sed passwords from filesystem into it... * move this setup to jenkins.d.o @@ -130,7 +129,7 @@ properties: ** 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 ** 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 ** turn job-cfg/g-i.yaml into .yaml.py diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index 87ea5299..22cd382d 100755 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -1080,7 +1080,7 @@ monitor_system() { echo "ERROR: An installation step failed." >> $GOCR exit 1 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 elif [ ! -z "$BUILD_LTSP_PROBLEM" ] ; then echo "ERROR: The failing step is: Build LTSP chroot." >> $GOCR diff --git a/bin/maintainance.sh b/bin/maintenance.sh index 89bf5fd1..c123a9bd 100755 --- a/bin/maintainance.sh +++ b/bin/maintenance.sh @@ -136,7 +136,7 @@ wait4idle() { echo "Done waiting: $(date)" } -general_maintainance() { +general_maintenance() { uptime echo @@ -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 - general_maintainance + general_maintenance compress_old_jenkins_logs report_squid_usage brief else diff --git a/bin/reproducible_maintainance.sh b/bin/reproducible_maintenance.sh index efdd9985..efdd9985 100755 --- a/bin/reproducible_maintainance.sh +++ b/bin/reproducible_maintenance.sh diff --git a/job-cfg/chroot-installation.yaml.py b/job-cfg/chroot-installation.yaml.py index d17761f6..6c5b49a4 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 = """ - maintainance + maintenance bootstrap gnome kde @@ -84,7 +84,7 @@ def get_targets_in_distro(distro, targets): # who gets mail for which target # def get_recipients(target): - if target == 'maintainance': + if target == 'maintenance': return 'qa-jenkins-scm@lists.alioth.debian.org' elif target == 'haskell': 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): # views for different targets # def get_view(target, distro): - if target == 'maintainance': + if target == 'maintenance': return 'jenkins.d.n' elif target == 'haskell': return 'haskell' @@ -198,19 +198,19 @@ print(""" """) for base_distro in sorted(base_distros): for target in sorted(get_targets_in_distro(base_distro, targets)): - if target in ('bootstrap', 'maintainance'): + if target in ('bootstrap', 'maintenance'): action = target else: action = 'install_'+target # default job - if target == 'maintainance' or base_distro != oldstable: + if target == 'maintenance' or base_distro != oldstable: print("""- job-template: defaults: chroot-installation name: '{name}_%(base_distro)s_%(action)s'""" % dict(base_distro=base_distro, action=action)) # upgrade job - if base_distro in distro_upgrades and action != 'maintainance': + if base_distro in distro_upgrades and action != 'maintenance': print("""- job-template: defaults: chroot-installation name: '{name}_%(base_distro)s_%(action)s_upgrade_to_%(second_base)s'""" % @@ -218,7 +218,7 @@ for base_distro in sorted(base_distros): action=action, second_base=distro_upgrades[base_distro])) # 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: defaults: chroot-installation name: '{name}_%(base_distro)s_%(action)s_upgrade_to_%(second_base)s_aptdpkg_first'""" % @@ -233,9 +233,9 @@ print(""" jobs:""") for base_distro in sorted(base_distros): 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.' - shell = '/srv/jenkins/bin/maintainance.sh chroot-installation_'+base_distro + shell = '/srv/jenkins/bin/maintenance.sh chroot-installation_'+base_distro prio = 135 time = trigger_times[base_distro] if base_distro in distro_upgrades.values(): @@ -252,7 +252,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 ('maintainance', 'bootstrap'): + if trigger_target not in ('maintenance', 'bootstrap'): if trigger != '': trigger = trigger+', ' trigger = trigger+'chroot-installation_'+base_distro+'_install_'+trigger_target @@ -262,12 +262,12 @@ for base_distro in sorted(base_distros): prio = 130 time = '' trigger = '' - if target in ('bootstrap', 'maintainance'): + if target in ('bootstrap', 'maintenance'): action = target else: action = 'install_'+target # default job - if target == 'maintainance' or base_distro != oldstable: + if target == 'maintenance' or base_distro != oldstable: print(""" - '{name}_%(base_distro)s_%(action)s': my_shell: '%(shell)s' my_prio: '%(prio)s' @@ -286,13 +286,13 @@ for base_distro in sorted(base_distros): view=get_view(target, base_distro), description=description)) # upgrade job - if base_distro in distro_upgrades and action != 'maintainance': + if base_distro in distro_upgrades and action != 'maintenance': 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 ('maintainance', 'bootstrap'): + if trigger_target not in ('maintenance', 'bootstrap'): if trigger != '': trigger = trigger+', ' 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): second_base=distro_upgrades[base_distro], description=description)) # 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.' if target == 'bootstrap': trigger = '' 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 != '': trigger = trigger+', ' trigger = trigger+'chroot-installation_'+base_distro+'_install_'+trigger_target+'_upgrade_to_'+distro_upgrades[base_distro]+'_aptdpkg_first' diff --git a/job-cfg/d-i.yaml b/job-cfg/d-i.yaml index e8c084db..039c9006 100644 --- a/job-cfg/d-i.yaml +++ b/job-cfg/d-i.yaml @@ -323,7 +323,7 @@ - job-template: defaults: d-i - name: '{name}_maintainance' + name: '{name}_maintenance' description: 'Cleanup and monitor so that there is a predictable environment.{do_not_edit}' properties: - sidebar: @@ -343,7 +343,7 @@ triggers: - timed: '30 5 * * *' builders: - - shell: '/srv/jenkins/bin/maintainance.sh {name}' + - shell: '/srv/jenkins/bin/maintenance.sh {name}' publishers: - logparser: parse-rules: '/srv/jenkins/logparse/debian.rules' @@ -804,7 +804,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/tree/job-cfg/d-i.yaml">d-i.yaml</a>.' jobs: - - '{name}_maintainance' + - '{name}_maintenance' - '{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 c6289de6..486c015a 100644 --- a/job-cfg/g-i-installation.yaml +++ b/job-cfg/g-i-installation.yaml @@ -59,7 +59,7 @@ categories: - g-i-installation - 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}' logrotate: daysToKeep: 90 @@ -69,7 +69,7 @@ triggers: - timed: "0 6 * * *" builders: - - shell: '/srv/jenkins/bin/maintainance.sh {name}' + - shell: '/srv/jenkins/bin/maintenance.sh {name}' publishers: - logparser: parse-rules: '/srv/jenkins/logparse/debian.rules' @@ -94,8 +94,8 @@ job-prio: '175' - job-template: - defaults: g-i-installation-maintainance - name: '{name}_maintainance' + defaults: g-i-installation-maintenance + name: '{name}_maintenance' - job-template: defaults: g-i-installation @@ -325,7 +325,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/tree/job-cfg/g-i-installation.yaml">g-i-installation.yaml</a>.' jobs: - - '{name}_maintainance' + - '{name}_maintenance' - '{name}_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' diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml index 9035b123..6fd2d40a 100644 --- a/job-cfg/reproducible.yaml +++ b/job-cfg/reproducible.yaml @@ -122,7 +122,7 @@ - job-template: defaults: reproducible - name: '{name}_maintainance' + name: '{name}_maintenance' - job-template: defaults: reproducible @@ -224,10 +224,10 @@ - project: name: reproducible jobs: - - '{name}_maintainance': - my_description: 'Do some maintainance: check for old directories laying around, do backups, etc.' + - '{name}_maintenance': + my_description: 'Do some maintenance: check for old directories laying around, do backups, etc.' 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' - '{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' diff --git a/job-cfg/schroot.yaml b/job-cfg/schroot.yaml index 1f5e6814..15f3f9d8 100644 --- a/job-cfg/schroot.yaml +++ b/job-cfg/schroot.yaml @@ -7,7 +7,7 @@ icon: /userContent/images/debian-swirl-24x24.png - sidebar: url: https://jenkins.debian.net/view/schroot-maint/ - text: schroot maintainance jobs + text: schroot maintenance jobs icon: /userContent/images/debian-jenkins-24x24.png - sidebar: url: http://www.profitbricks.com @@ -37,7 +37,7 @@ icon: /userContent/images/debian-swirl-24x24.png - sidebar: url: https://jenkins.debian.net/view/schroot-maint/ - text: schroot maintainance jobs + text: schroot maintenance jobs icon: /userContent/images/debian-jenkins-24x24.png - sidebar: url: http://www.profitbricks.com diff --git a/job-cfg/self.yaml b/job-cfg/self.yaml index ed6f9be2..e90bc0fb 100644 --- a/job-cfg/self.yaml +++ b/job-cfg/self.yaml @@ -1,5 +1,5 @@ - defaults: - name: self-maintainance + name: self-maintenance description: 'Cleanup and monitor so that there is a predictable environment.{do_not_edit}' logrotate: daysToKeep: 90 @@ -30,8 +30,8 @@ job-prio: '125' - job-template: - defaults: self-maintainance - name: '{name}_maintainance' + defaults: self-maintenance + name: '{name}_maintenance' publishers: - logparser: parse-rules: '/srv/jenkins/logparse/debian.rules' @@ -39,21 +39,21 @@ fail-on-error: 'true' - job-template: - defaults: self-maintainance - name: '{name}_sub-maintainance' - defaults: self-maintainance - name: '{name}_sub-maintainance-squid' - defaults: self-maintainance - name: 'rebootstrap_maintainance' + defaults: self-maintenance + name: '{name}_sub-maintenance' + defaults: self-maintenance + name: '{name}_sub-maintenance-squid' + defaults: self-maintenance + name: 'rebootstrap_maintenance' - project: 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>.' jobs: - - '{name}_maintainance': - my_shell: '/srv/jenkins/bin/maintainance.sh' - - '{name}_sub-maintainance-squid': - my_shell: '/srv/jenkins/bin/maintainance.sh squid' - - 'rebootstrap_maintainance': - my_shell: '/srv/jenkins/bin/maintainance.sh rebootstrap' + - '{name}_maintenance': + my_shell: '/srv/jenkins/bin/maintenance.sh' + - '{name}_sub-maintenance-squid': + my_shell: '/srv/jenkins/bin/maintenance.sh squid' + - 'rebootstrap_maintenance': + my_shell: '/srv/jenkins/bin/maintenance.sh rebootstrap' |