From e19c1cb72298cd19cc329546fc706c6bfcf658aa Mon Sep 17 00:00:00 2001
From: Philip Hands <phil@hands.com>
Date: Sun, 13 Mar 2016 22:33:15 +0100
Subject: 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
---
 job-cfg/d-i.yaml.py               | 4 ++--
 job-cfg/debsums-tests.yaml        | 3 ++-
 job-cfg/edu-packages.yaml         | 3 ++-
 job-cfg/haskell-package-plan.yaml | 3 ++-
 job-cfg/lintian-tests.yaml        | 3 ++-
 job-cfg/piuparts.yaml             | 3 ++-
 job-cfg/rebootstrap.yaml.py       | 3 ++-
 job-cfg/reproducible.yaml         | 6 ++++--
 job-cfg/torbrowser-launcher.yaml  | 3 ++-
 9 files changed, 20 insertions(+), 11 deletions(-)

(limited to 'job-cfg')

diff --git a/job-cfg/d-i.yaml.py b/job-cfg/d-i.yaml.py
index 20e2f581..43450e5c 100755
--- a/job-cfg/d-i.yaml.py
+++ b/job-cfg/d-i.yaml.py
@@ -298,7 +298,7 @@ def jobspec_svn(key, name, desc, defaults=None,
     if defaults is not None:
         j['defaults'] = defaults
     if trigger is not None:
-        j['triggers'] = [{'pollscm': trigger}]
+        j['triggers'] = [{'pollscm': {'cron': trigger}}]
     if logkeep is not None:
         j['logrotate'] = lr(logkeep)
     return {key: j}
@@ -339,7 +339,7 @@ data.extend(
         'description': ('Builds debian packages in sid from git {branchdesc}, '
                         'triggered by pushes to <pre>{gitrepo}</pre> '
                         '{do_not_edit}'),
-        'triggers': [{'pollscm': '{trg}'}],
+        'triggers': [{'pollscm': {'cron': '{trg}'}}],
         'scm': [{'git': {'url': '{gitrepo}',
                          'branches': ['{branch}']}}],
         'builders': [{'shell': '/srv/jenkins/bin/d-i_build.sh'}],
diff --git a/job-cfg/debsums-tests.yaml b/job-cfg/debsums-tests.yaml
index cd12226d..73a2c0bc 100644
--- a/job-cfg/debsums-tests.yaml
+++ b/job-cfg/debsums-tests.yaml
@@ -48,7 +48,8 @@
     defaults: debsums-tests
     name: '{name}_sid'
     triggers:
-      - pollscm: '*/6 * * * *'
+      - pollscm:
+          cron: '*/6 * * * *'
     publishers:
       - email:
           recipients: 'jenkins+debian-qa qa-jenkins-scm@lists.alioth.debian.org pkg-perl-maintainers@lists.alioth.debian.org'
diff --git a/job-cfg/edu-packages.yaml b/job-cfg/edu-packages.yaml
index 725fa51d..f20c4b3c 100644
--- a/job-cfg/edu-packages.yaml
+++ b/job-cfg/edu-packages.yaml
@@ -28,7 +28,8 @@
     builders:
       - shell: '/srv/jenkins/bin/chroot-run.sh {my_distro} debuild -b -uc -us'
     triggers:
-      - pollscm: '*/6 * * * *'
+      - pollscm:
+          cron: '*/6 * * * *'
     publishers:
       - email:
           recipients: 'jenkins+debian-edu debian-edu-commits@lists.alioth.debian.org'
diff --git a/job-cfg/haskell-package-plan.yaml b/job-cfg/haskell-package-plan.yaml
index de6bc548..7b2bfedf 100644
--- a/job-cfg/haskell-package-plan.yaml
+++ b/job-cfg/haskell-package-plan.yaml
@@ -58,7 +58,8 @@
     defaults: haskell-package-plan
     name: '{name}'
     triggers:
-      - pollscm: '*/6 * * * *'
+      - pollscm:
+          cron: '*/6 * * * *'
       - timed: '0 16 * * *'    # every day at 16:00 UTC
 
 - project:
diff --git a/job-cfg/lintian-tests.yaml b/job-cfg/lintian-tests.yaml
index 8e6450c1..13be2b34 100644
--- a/job-cfg/lintian-tests.yaml
+++ b/job-cfg/lintian-tests.yaml
@@ -58,7 +58,8 @@
     defaults: lintian-tests
     name: '{name}_sid'
     triggers:
-      - pollscm: '*/6 * * * *'
+      - pollscm:
+          cron: '*/6 * * * *'
     publishers:
       - email:
           recipients: 'jenkins+debian-qa qa-jenkins-scm@lists.alioth.debian.org lintian-maint@debian.org'
diff --git a/job-cfg/piuparts.yaml b/job-cfg/piuparts.yaml
index ff14012b..337b8993 100644
--- a/job-cfg/piuparts.yaml
+++ b/job-cfg/piuparts.yaml
@@ -52,7 +52,8 @@
     defaults: piuparts
     name: '{name}_testsuite_sid'
     triggers:
-      - pollscm: '*/6 * * * *'
+      - pollscm:
+          cron: '*/6 * * * *'
     publishers:
       - email:
           recipients: 'jenkins+debian-qa qa-jenkins-scm@lists.alioth.debian.org piuparts-devel@lists.alioth.debian.org'
diff --git a/job-cfg/rebootstrap.yaml.py b/job-cfg/rebootstrap.yaml.py
index 23ec5eda..39de2fec 100755
--- a/job-cfg/rebootstrap.yaml.py
+++ b/job-cfg/rebootstrap.yaml.py
@@ -83,7 +83,8 @@ print("""
       - email:
           recipients: 'jenkins+debian-bootstrap helmutg@debian.org'
     triggers:
-      - pollscm: '*/6 * * * *'
+      - pollscm:
+          cron: '*/6 * * * *'
     node: '{my_node}'
 """)
 
diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index 10d54315..90cd218c 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -43,7 +43,8 @@
     description: *desc
     triggers:
       - timed: '{my_timed}'
-      - pollscm: '*/6 * * * *'
+      - pollscm:
+          cron: '*/6 * * * *'
     logrotate:
       daysToKeep: 90
       numToKeep: 20
@@ -186,7 +187,8 @@
             - reproducible      # no special category yet
     triggers:
       - timed: '{my_timed}'
-      - pollscm: '*/6 * * * *'
+      - pollscm:
+          cron: '*/6 * * * *'
     logrotate:
       daysToKeep: 90
       numToKeep: 30
diff --git a/job-cfg/torbrowser-launcher.yaml b/job-cfg/torbrowser-launcher.yaml
index db2200b9..e4cae154 100644
--- a/job-cfg/torbrowser-launcher.yaml
+++ b/job-cfg/torbrowser-launcher.yaml
@@ -38,7 +38,8 @@
     name: torbrowser-launcher_git
     project-type: freestyle
     triggers:
-      - pollscm: '*/6 * * * *'
+      - pollscm:
+          cron: '*/6 * * * *'
       - timed: '{my_timed}'
     sb_desc: torbrowser-launcher
     properties:
-- 
cgit v1.2.3-70-g09d2