From 88daeb1230ccff7de0b0a4273c2ad94aebe27d24 Mon Sep 17 00:00:00 2001 From: Philip Hands Date: Tue, 2 Jun 2015 22:11:39 +0100 Subject: d-i.yaml/pl: code tidying --- job-cfg/d-i.yaml.py | 202 +++++++++++++++++++++++++++++----------------------- 1 file changed, 114 insertions(+), 88 deletions(-) diff --git a/job-cfg/d-i.yaml.py b/job-cfg/d-i.yaml.py index 2df6016b..23229865 100755 --- a/job-cfg/d-i.yaml.py +++ b/job-cfg/d-i.yaml.py @@ -35,7 +35,7 @@ langs = { } non_pdf_langs = ['el', 'vi', 'ja', 'zh_CN', 'zh_TW'] -non_po_langs = ['ca', 'cs', 'de', 'en', 'fr', 'it', 'pt_BR'] +non_po_langs = ['ca', 'cs', 'de', 'en', 'fr', 'it', 'pt_BR'] pkgs = """ anna @@ -139,7 +139,8 @@ yaboot-installer zipl-installer """.split() -def scm_svn(po,inc_regs=None): + +def scm_svn(po, inc_regs=None): po_str = '' if po == True: po_str = 'po/' @@ -157,6 +158,7 @@ def scm_svn(po,inc_regs=None): 'excludedRegions': '', 'viewvc-url': 'http://anonscm.debian.org/viewvc/d-i/trunk'}}] + def svn_desc(po, fmt): s = 'Builds the {languagename} ' + fmt + ' version of the installation-guide for all architectures. ' s += 'Triggered by SVN commits to svn://anonscm.debian.org/svn/d-i/trunk/manual' @@ -164,36 +166,45 @@ def svn_desc(po, fmt): s += '/{lang}/. After successful build d-i_manual_{lang}_pdf is triggered. {do_not_edit}' return s + def pdf_desc(): s = 'Builds the {languagename} pdf version of the installation-guide for all architectures. Triggered by successful build of d-i_manual_{lang}_html. {do_not_edit}' return s + def instguide_desc(): return 'Builds the installation-guide package. Triggered by SVN commits to svn://anonscm.debian.org/svn/d-i/ matching these patterns: 
{include}
{do_not_edit}' + def sb_about(): return {'sidebar': {'url': 'https://jenkins.debian.net/userContent/about.html', 'text': 'About jenkins.debian.net', 'icon': '/userContent/images/debian-swirl-24x24.png'}} + def sb_misc(): return {'sidebar': {'url': 'https://jenkins.debian.net/view/d-i_misc/', 'text': 'Misc debian-installer jobs', 'icon': '/userContent/images/debian-jenkins-24x24.png'}} + def sb_manual(): return {'sidebar': {'url': 'https://jenkins.debian.net/view/d-i_manual/', 'text': 'debian-installer manual jobs', 'icon': '/userContent/images/debian-jenkins-24x24.png'}} + def sb_pkgs(): return {'sidebar': {'url': 'https://jenkins.debian.net/view/d-i_packages/', 'text': 'debian-installer packages jobs', 'icon': '/userContent/images/debian-jenkins-24x24.png'}} + def sb_pbricks(): return {'sidebar': {'url': 'http://www.profitbricks.co.uk', 'text': 'Sponsored by Profitbricks', 'icon': '/userContent/images/profitbricks-24x24.png'}} + def lr(keep): return {'artifactDaysToKeep': -1, 'daysToKeep': keep, 'numToKeep': 30, 'artifactNumToKeep': -1} + def publ(fmt=None,trigger=False): p = [] if trigger: @@ -207,21 +218,28 @@ def publ(fmt=None,trigger=False): p.append({'archive': {'artifacts': fmt + '/**/*.*', 'latest_only': True}}) return p + def publ_email(): return [{'email': {'recipients': 'jenkins+debian-boot qa-jenkins-scm@lists.alioth.debian.org'}}] + def prop(middle=sb_manual, priority=None): arr = [sb_about(), middle(), sb_pbricks()] if priority != None: arr.append( {'priority': {'job-prio': str(priority)}} ) return arr -def jtmpl(act, lang, fmt, po=False): + +def jtmpl(act, lang, fmt=None, po=False): return {'job-template': {'name': '{name}_' + act + '_' + lang + ('_' + fmt if fmt else ''), 'defaults': 'd-i-' + act + ('-' + fmt if fmt else '') + ('-po2xml' if po else '')}} -def jobspec(name,priority=120,logkeep=None,trigger=None,publisher=None,desc=None,po=False,fmt=None,defaults=None,lang=None,inc_regs=None): + + +def jobspec_svn(name, desc=None, defaults=None, + priority=120, logkeep=None, trigger=None, publisher=None, + lang=None, fmt=None, po=False, inc_regs=None ): j = {'scm': scm_svn(po=po,inc_regs=inc_regs), 'project-type': 'freestyle', 'builders': [{'shell': '/srv/jenkins/bin/d-i_manual.sh' @@ -231,6 +249,7 @@ def jobspec(name,priority=120,logkeep=None,trigger=None,publisher=None,desc=None 'properties': prop(priority=priority), 'name': name} j['publishers'] = publisher() if publisher != None else publ(fmt=fmt,trigger=trigger) + if desc != None: j['description'] = desc() else: @@ -247,104 +266,111 @@ def jobspec(name,priority=120,logkeep=None,trigger=None,publisher=None,desc=None data = [] -data.append({'defaults':{'name': 'd-i', - 'logrotate': lr(90), - 'project-type': 'freestyle', - 'properties': prop(middle=sb_misc)}}) - -data.append({'defaults': jobspec(name='d-i-manual-html', - fmt='html', - lang='{lang}', - trigger=15, - logkeep=90)}) - -data.append({'defaults': jobspec(name='d-i-manual-html-po2xml', - fmt='html', - lang='{lang}', - po=True, - trigger=30, - logkeep=90)}) - -data.append({'defaults': jobspec(name='d-i-manual-pdf', - fmt='pdf', - lang='{lang}', - desc=pdf_desc, - logkeep=90)}) - -data.append({'defaults': jobspec(name='d-i-manual-pdf-po2xml', - fmt='pdf', - lang='{lang}', - desc=pdf_desc, - po=True, - logkeep=90)}) - -data.append( - {'defaults': {'scm': [{'git': {'url': '{gitrepo}', - 'branches': ['master']}}], - 'publishers': publ(), - 'description': 'Builds debian packages in sid from git master branch, triggered by pushes to 
{gitrepo}
{do_not_edit}', - 'triggers': [{'pollscm': '*/6 * * * *'}], - 'project-type': 'freestyle', - 'logrotate': lr(90), - 'builders': [{'shell': '/srv/jenkins/bin/d-i_build.sh'}], - 'properties': prop(middle=sb_pkgs, priority=99), - 'name': 'd-i-build'}}, +data.append( {'defaults': { 'name': 'd-i', + 'logrotate': lr(90), + 'project-type': 'freestyle', + 'properties': prop(middle=sb_misc)}}) + +data.append( {'defaults': jobspec_svn( name='d-i-manual-html', + fmt='html', + lang='{lang}', + trigger=15, + logkeep=90 )}) + +data.append( {'defaults': jobspec_svn( name='d-i-manual-html-po2xml', + fmt='html', + lang='{lang}', + po=True, + trigger=30, + logkeep=90 )}) + +data.append( {'defaults': jobspec_svn( name='d-i-manual-pdf', + fmt='pdf', + lang='{lang}', + desc=pdf_desc, + logkeep=90 )}) + +data.append( {'defaults': jobspec_svn( name='d-i-manual-pdf-po2xml', + fmt='pdf', + lang='{lang}', + desc=pdf_desc, + po=True, + logkeep=90 )}) + +data.append( {'defaults': { 'name': 'd-i-build', + 'description': 'Builds debian packages in sid from git master branch, triggered by pushes to 
{gitrepo}
{do_not_edit}', + 'triggers': [{'pollscm': '*/6 * * * *'}], + 'scm': [{'git': {'url': '{gitrepo}', + 'branches': ['master', 'pu/*']}}], + 'builders': [{'shell': '/srv/jenkins/bin/d-i_build.sh'}], + 'project-type': 'freestyle', + 'properties': prop(middle=sb_pkgs, priority=99), + 'logrotate': lr(90), + 'publishers': publ()}} ) -data.append({'job-template': jobspec(defaults='d-i', - name='{name}_manual', - desc=instguide_desc, - trigger=15, priority=125, - publisher=publ_email, - inc_regs='{include}')}) +data.append({'job-template': jobspec_svn( defaults='d-i', + name='{name}_manual', + desc=instguide_desc, + trigger=15, priority=125, + publisher=publ_email, + inc_regs='{include}')}) data.append( - {'job-template': {'publishers': [{'logparser': {'parse-rules': '/srv/jenkins/logparse/debian.rules', - 'unstable-on-warning': 'true', - 'fail-on-error': 'true'}}, - {'email': {'recipients': 'qa-jenkins-scm@lists.alioth.debian.org'}}], - 'name': '{name}_check_jenkins_jobs', - 'defaults': 'd-i', - 'triggers': [{'timed': '23 0 * * *'}], - 'builders': [{'shell': '/srv/jenkins/bin/d-i_check_jobs.sh'}], - 'description': 'Checks daily for missing jenkins jobs. {do_not_edit}'}}, + {'job-template': { 'defaults': 'd-i', + 'name': '{name}_check_jenkins_jobs', + 'description': 'Checks daily for missing jenkins jobs. {do_not_edit}', + 'triggers': [{'timed': '23 0 * * *'}], + 'builders': [{'shell': '/srv/jenkins/bin/d-i_check_jobs.sh'}], + 'publishers': [{'logparser': {'parse-rules': '/srv/jenkins/logparse/debian.rules', + 'unstable-on-warning': 'true', + 'fail-on-error': 'true'}}, + {'email': {'recipients': 'qa-jenkins-scm@lists.alioth.debian.org'}}]}} ) data.append( - {'job-template': {'publishers': [{'logparser': {'parse-rules': '/srv/jenkins/logparse/debian.rules', - 'unstable-on-warning': 'true', - 'fail-on-error': 'true'}}, - {'email': {'recipients': 'jenkins+debian-boot qa-jenkins-scm@lists.alioth.debian.org'}}], - 'name': '{name}_maintenance', - 'defaults': 'd-i', - 'triggers': [{'timed': '30 5 * * *'}], - 'builders': [{'shell': '/srv/jenkins/bin/maintenance.sh {name}'}], - 'properties': prop(priority=150), - 'description': 'Cleanup and monitor so that there is a predictable environment.{do_not_edit}'}} - ) - - -data.extend(map(lambda l: jtmpl('manual',l,'html',l not in non_po_langs), langs.keys())) -data.extend(map(lambda l: jtmpl('manual',l,'pdf',l not in non_po_langs), + {'job-template': { 'defaults': 'd-i', + 'name': '{name}_maintenance', + 'description': 'Cleanup and monitor so that there is a predictable environment.{do_not_edit}', + 'triggers': [{'timed': '30 5 * * *'}], + 'builders': [{'shell': '/srv/jenkins/bin/maintenance.sh {name}'}], + 'properties': prop(priority=150), + 'publishers': [{'logparser': {'parse-rules': '/srv/jenkins/logparse/debian.rules', + 'unstable-on-warning': 'true', + 'fail-on-error': 'true'}}, + {'email': {'recipients': 'jenkins+debian-boot qa-jenkins-scm@lists.alioth.debian.org'}}]}} +) + + +data.extend(map(lambda l: jtmpl(act='manual',lang=l,fmt='html',po=(l not in non_po_langs)), langs.keys())) + +data.extend(map(lambda l: jtmpl(act='manual',lang=l,fmt='pdf',po=(l not in non_po_langs)), filter(lambda l: l not in non_pdf_langs, langs.keys()))) -data.extend(map(lambda l: jtmpl('build',l,None), pkgs)) +data.extend(map(lambda l: jtmpl(act='build',lang=l), pkgs)) -jobs = [ - '{name}_maintenance', - '{name}_check_jenkins_jobs', - {'{name}_manual': {'include': '/trunk/manual/debian/.*\n/trunk/manual/po/.*\n/trunk/manual/doc/.*\n/trunk/manual/scripts/.*'}}] -jobs.extend(map(lambda (l, lang): {'{name}_manual_' + l + '_html': {'lang': l, 'languagename': lang}}, langs.iteritems())) +jobs = [ '{name}_maintenance', + '{name}_check_jenkins_jobs', + {'{name}_manual': {'include': ( '/trunk/manual/debian/.*\n' + '/trunk/manual/po/.*\n' + '/trunk/manual/doc/.*\n' + '/trunk/manual/scripts/.*' )}}] + +jobs.extend(map(lambda (l, lang): {'{name}_manual_' + l + '_html': {'lang': l, 'languagename': lang}}, + langs.iteritems())) + jobs.extend(map(lambda (l, lang): {'{name}_manual_' + l + '_pdf': {'lang': l, 'languagename': lang}}, - filter(lambda (l, x): l not in non_pdf_langs, langs.iteritems()))) -jobs.extend(map(lambda (p): {'{name}_build_' + p: {'gitrepo': 'git://git.debian.org/git/d-i/' + p}}, pkgs)) + filter(lambda (l, x): l not in non_pdf_langs, + langs.iteritems()))) + +jobs.extend(map(lambda (p): {'{name}_build_' + p: {'gitrepo': 'git://git.debian.org/git/d-i/' + p}}, + pkgs)) data.append( - {'project': { - 'jobs': jobs, - 'name': 'd-i', - 'do_not_edit': '

Job configuration source is d-i.yaml.py.'}} + {'project': { 'name': 'd-i', + 'do_not_edit': '

Job configuration source is d-i.yaml.py.', + 'jobs': jobs}} ) sys.stdout.write( dump(data, Dumper=Dumper) ) -- cgit v1.2.3-54-g00ecf