summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-12-21 15:59:58 +0100
committerHolger Levsen <holger@layer-acht.org>2014-12-21 15:59:58 +0100
commit9b2a61a1156f1530bfeaa43bd26c2b2b065df7b3 (patch)
treecb17d48d35dbb4637fa6b6084e7f948ec9ca0230
parente582267e16148eccbf842c4c88ea1a41f74f1340 (diff)
downloadjenkins.debian.net-9b2a61a1156f1530bfeaa43bd26c2b2b065df7b3.tar.xz
chroot-installation: fix triggers for _aptdpkg_first jobs and don't create such maintaince jobs
-rwxr-xr-xjob-cfg/chroot-installation.yaml.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/job-cfg/chroot-installation.yaml.py b/job-cfg/chroot-installation.yaml.py
index a7181bee..fa7827c4 100755
--- a/job-cfg/chroot-installation.yaml.py
+++ b/job-cfg/chroot-installation.yaml.py
@@ -215,7 +215,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-':
+ if base_distro in distro_upgrades and base_distro != oldstable and target[:10] != 'education-' and action != 'maintainance':
print("""- job-template:
defaults: chroot-installation
name: '{name}_%(base_distro)s_%(action)s_upgrade_to_%(second_base)s_aptdpkg_first'""" %
@@ -315,7 +315,15 @@ 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-':
+ if base_distro in distro_upgrades and base_distro != oldstable and target[:10] != 'education-' and action != 'maintainance':
+ 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 != '':
+ trigger = trigger+', '
+ trigger = trigger+'chroot-installation_'+base_distro+'_install_'+trigger_target+'_upgrade_to_'+distro_upgrades[base_distro]+_aptdpkg_first'
print(""" - '{name}_%(base_distro)s_%(action)s_upgrade_to_%(second_base)s_aptdpkg_first':
my_shell: '%(shell)s'
my_prio: '%(prio)s'