Commit e19c1cb7 authored by Philip Hands's avatar Philip Hands Committed by Holger Levsen
Browse files

use new 'cron' parameter for pollscm

old style deprecated since 1.3.0, according to:

  http://docs.openstack.org/infra/jenkins-job-builder/triggers.html#triggers.pollscm
parent a721c3d3
...@@ -298,7 +298,7 @@ def jobspec_svn(key, name, desc, defaults=None, ...@@ -298,7 +298,7 @@ def jobspec_svn(key, name, desc, defaults=None,
if defaults is not None: if defaults is not None:
j['defaults'] = defaults j['defaults'] = defaults
if trigger is not None: if trigger is not None:
j['triggers'] = [{'pollscm': trigger}] j['triggers'] = [{'pollscm': {'cron': trigger}}]
if logkeep is not None: if logkeep is not None:
j['logrotate'] = lr(logkeep) j['logrotate'] = lr(logkeep)
return {key: j} return {key: j}
...@@ -339,7 +339,7 @@ data.extend( ...@@ -339,7 +339,7 @@ data.extend(
'description': ('Builds debian packages in sid from git {branchdesc}, ' 'description': ('Builds debian packages in sid from git {branchdesc}, '
'triggered by pushes to <pre>{gitrepo}</pre> ' 'triggered by pushes to <pre>{gitrepo}</pre> '
'{do_not_edit}'), '{do_not_edit}'),
'triggers': [{'pollscm': '{trg}'}], 'triggers': [{'pollscm': {'cron': '{trg}'}}],
'scm': [{'git': {'url': '{gitrepo}', 'scm': [{'git': {'url': '{gitrepo}',
'branches': ['{branch}']}}], 'branches': ['{branch}']}}],
'builders': [{'shell': '/srv/jenkins/bin/d-i_build.sh'}], 'builders': [{'shell': '/srv/jenkins/bin/d-i_build.sh'}],
......
...@@ -48,7 +48,8 @@ ...@@ -48,7 +48,8 @@
defaults: debsums-tests defaults: debsums-tests
name: '{name}_sid' name: '{name}_sid'
triggers: triggers:
- pollscm: '*/6 * * * *' - pollscm:
cron: '*/6 * * * *'
publishers: publishers:
- email: - email:
recipients: 'jenkins+debian-qa qa-jenkins-scm@lists.alioth.debian.org pkg-perl-maintainers@lists.alioth.debian.org' recipients: 'jenkins+debian-qa qa-jenkins-scm@lists.alioth.debian.org pkg-perl-maintainers@lists.alioth.debian.org'
......
...@@ -28,7 +28,8 @@ ...@@ -28,7 +28,8 @@
builders: builders:
- shell: '/srv/jenkins/bin/chroot-run.sh {my_distro} debuild -b -uc -us' - shell: '/srv/jenkins/bin/chroot-run.sh {my_distro} debuild -b -uc -us'
triggers: triggers:
- pollscm: '*/6 * * * *' - pollscm:
cron: '*/6 * * * *'
publishers: publishers:
- email: - email:
recipients: 'jenkins+debian-edu debian-edu-commits@lists.alioth.debian.org' recipients: 'jenkins+debian-edu debian-edu-commits@lists.alioth.debian.org'
......
...@@ -58,7 +58,8 @@ ...@@ -58,7 +58,8 @@
defaults: haskell-package-plan defaults: haskell-package-plan
name: '{name}' name: '{name}'
triggers: triggers:
- pollscm: '*/6 * * * *' - pollscm:
cron: '*/6 * * * *'
- timed: '0 16 * * *' # every day at 16:00 UTC - timed: '0 16 * * *' # every day at 16:00 UTC
- project: - project:
......
...@@ -58,7 +58,8 @@ ...@@ -58,7 +58,8 @@
defaults: lintian-tests defaults: lintian-tests
name: '{name}_sid' name: '{name}_sid'
triggers: triggers:
- pollscm: '*/6 * * * *' - pollscm:
cron: '*/6 * * * *'
publishers: publishers:
- email: - email:
recipients: 'jenkins+debian-qa qa-jenkins-scm@lists.alioth.debian.org lintian-maint@debian.org' recipients: 'jenkins+debian-qa qa-jenkins-scm@lists.alioth.debian.org lintian-maint@debian.org'
......
...@@ -52,7 +52,8 @@ ...@@ -52,7 +52,8 @@
defaults: piuparts defaults: piuparts
name: '{name}_testsuite_sid' name: '{name}_testsuite_sid'
triggers: triggers:
- pollscm: '*/6 * * * *' - pollscm:
cron: '*/6 * * * *'
publishers: publishers:
- email: - email:
recipients: 'jenkins+debian-qa qa-jenkins-scm@lists.alioth.debian.org piuparts-devel@lists.alioth.debian.org' recipients: 'jenkins+debian-qa qa-jenkins-scm@lists.alioth.debian.org piuparts-devel@lists.alioth.debian.org'
......
...@@ -83,7 +83,8 @@ print(""" ...@@ -83,7 +83,8 @@ print("""
- email: - email:
recipients: 'jenkins+debian-bootstrap helmutg@debian.org' recipients: 'jenkins+debian-bootstrap helmutg@debian.org'
triggers: triggers:
- pollscm: '*/6 * * * *' - pollscm:
cron: '*/6 * * * *'
node: '{my_node}' node: '{my_node}'
""") """)
......
...@@ -43,7 +43,8 @@ ...@@ -43,7 +43,8 @@
description: *desc description: *desc
triggers: triggers:
- timed: '{my_timed}' - timed: '{my_timed}'
- pollscm: '*/6 * * * *' - pollscm:
cron: '*/6 * * * *'
logrotate: logrotate:
daysToKeep: 90 daysToKeep: 90
numToKeep: 20 numToKeep: 20
...@@ -186,7 +187,8 @@ ...@@ -186,7 +187,8 @@
- reproducible # no special category yet - reproducible # no special category yet
triggers: triggers:
- timed: '{my_timed}' - timed: '{my_timed}'
- pollscm: '*/6 * * * *' - pollscm:
cron: '*/6 * * * *'
logrotate: logrotate:
daysToKeep: 90 daysToKeep: 90
numToKeep: 30 numToKeep: 30
......
...@@ -38,7 +38,8 @@ ...@@ -38,7 +38,8 @@
name: torbrowser-launcher_git name: torbrowser-launcher_git
project-type: freestyle project-type: freestyle
triggers: triggers:
- pollscm: '*/6 * * * *' - pollscm:
cron: '*/6 * * * *'
- timed: '{my_timed}' - timed: '{my_timed}'
sb_desc: torbrowser-launcher sb_desc: torbrowser-launcher
properties: properties:
......
Supports Markdown
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