diff options
| author | Philip Hands <phil@hands.com> | 2015-12-10 21:45:54 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-12-11 10:45:17 +0100 |
| commit | 4606474fa991660369602bca6750dbf39fb33e82 (patch) | |
| tree | a1c513f59da18ac6c020e2d16c3ef6d7fcbf8c11 /job-cfg | |
| parent | d360afd82acb1b8ba8561938faa0a7160f38cec4 (diff) | |
| download | jenkins.debian.net-4606474fa991660369602bca6750dbf39fb33e82.tar.xz | |
take account of the fact that 'included-regions' is an array
instguide_desc() may need some work to make the list of patterns
look pretty, as at present it's just using str() around an array.
Diffstat (limited to 'job-cfg')
| -rwxr-xr-x | job-cfg/d-i.yaml.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/job-cfg/d-i.yaml.py b/job-cfg/d-i.yaml.py index 79a0fc05..e5f66422 100755 --- a/job-cfg/d-i.yaml.py +++ b/job-cfg/d-i.yaml.py @@ -147,7 +147,7 @@ zipl-installer def scm_svn(po, inc_regs=None): if inc_regs == None: - inc_regs = os.path.join('/trunk/manual/', 'po' if po else '', '{lang}', '.*') + inc_regs = [ os.path.join('/trunk/manual/', 'po' if po else '', '{lang}', '.*') ] return [{'svn': {'excluded-commit-messages': '', 'url': 'svn://anonscm.debian.org/svn/d-i/trunk', @@ -174,7 +174,7 @@ def pdf_desc(): def instguide_desc(): - return 'Builds the installation-guide package. Triggered by SVN commits to <code>svn://anonscm.debian.org/svn/d-i/</code> matching these patterns: <pre>{include}</pre>' + return 'Builds the installation-guide package. Triggered by SVN commits to <code>svn://anonscm.debian.org/svn/d-i/</code> matching these patterns: <pre>' + str(manual_includes) + '</pre>' def lr(keep): @@ -260,10 +260,8 @@ def templs_jobs(): templates = [] 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/.*' )}}] + '{name}_manual', + ] def tj_append(t, j): templates.append(t) jobs.append(j) @@ -326,6 +324,8 @@ data.extend( in [('d-i-build', 'master branch', 'origin/master', 'H/6 * * * *', None), # irc should be 'debian-boot' but disabled due to gcc5 transition ('d-i-pu-build', 'pu/ branches', 'origin/pu/**' , 'H/10 * * * *', None)]]) # same +manual_includes = [ '/trunk/manual/debian/.*', '/trunk/manual/po/.*', '/trunk/manual/doc/.*', '/trunk/manual/scripts/.*' ] + data.append( jobspec_svn(key='job-template', defaults='d-i', @@ -334,7 +334,7 @@ data.append( trigger=15, priority=125, publishers=[publ_email()], - inc_regs='{include}')) + inc_regs=manual_includes)) data.append( {'job-template': { 'defaults': 'd-i', |