Merge pull request #1153 from daspilker/JENKINS-55429

[FIXES JENKINS-55429] replaced built-in support for periodic folder trigger by Dynamic DSL
jenkinsci · Jan 8, 2019 · 207a6e1 · 207a6e1
2 parents 3bee68c + 40cf65b
commit 207a6e1
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 2 deletions.
diff --git a/docs/Home.md b/docs/Home.md
@@ -30,6 +30,8 @@ Browse the Jenkins issue tracker to see any [open issues](https://issues.jenkins
 ## Release Notes
 * 1.72 (unreleased)
   * Increased the minimum supported Jenkins version to 2.121
+  * Replaced built-in support for periodic folder trigger, see [Migration](Migration#migrating-to-172)
+    ([JENKINS-55429](https://issues.jenkins-ci.org/browse/JENKINS-55429))
   * Removed anything that has been deprecated in 1.70, see [Migration](Migration#migrating-to-170)
   * Removed anything that has been deprecated in 1.69, see [Migration](Migration#migrating-to-169)
   * Removed anything that has been deprecated in 1.68, see [Migration](Migration#migrating-to-168)

diff --git a/docs/Migration.md b/docs/Migration.md
@@ -1,3 +1,32 @@
+## Migrating to 1.72
+
+### CloudBees Folders Plugin
+
+The `periodic` trigger is broken ([JENKINS-55429](https://issues.jenkins-ci.org/browse/JENKINS-55429)) and will be
+removed. It can be replaced by [[Dynamic DSL]]:
+
+DSL prior to 1.72
+```
+organizationFolder('example') {
+    triggers {
+        periodicFolderTrigger {
+            interval(2)
+        }
+    }
+}
+```
+
+DSL since 1.72
+```
+organizationFolder('example') {
+    triggers {
+        periodicFolderTrigger {
+            interval('2m')
+        }
+    }
+}
+```
+
 ## Migrating to 1.70
 
 The following methods in the `pipelineJob` are [[deprecated|Deprecation-Policy]] and will be removed because they are

diff --git a/job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/triggers/ItemTriggerContext.groovy b/job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/triggers/ItemTriggerContext.groovy
@@ -1,6 +1,7 @@
 package javaposse.jobdsl.dsl.helpers.triggers
 
 import javaposse.jobdsl.dsl.ContextHelper
+import javaposse.jobdsl.dsl.ContextType
 import javaposse.jobdsl.dsl.DslContext
 import javaposse.jobdsl.dsl.Item
 import javaposse.jobdsl.dsl.JobManagement
@@ -11,6 +12,7 @@ import javaposse.jobdsl.dsl.AbstractExtensibleContext
 /**
  * @since 1.42
  */
+@ContextType('hudson.triggers.Trigger')
 class ItemTriggerContext extends AbstractExtensibleContext {
     final List<Node> triggerNodes = []
 

diff --git a/...ain/groovy/javaposse/jobdsl/dsl/helpers/triggers/MultibranchWorkflowTriggerContext.groovy b/...ain/groovy/javaposse/jobdsl/dsl/helpers/triggers/MultibranchWorkflowTriggerContext.groovy
@@ -15,6 +15,7 @@ class MultibranchWorkflowTriggerContext extends ItemTriggerContext {
      * @since 1.42
      */
     @RequiresPlugin(id = 'cloudbees-folder', minimumVersion = '5.1')
+    @Deprecated
     void periodic(int minutes) {
         triggerNodes << new NodeBuilder().'com.cloudbees.hudson.plugins.folder.computed.PeriodicFolderTrigger' {
             spec('* * * * *')

diff --git a/job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/triggers/TriggerContext.groovy b/job-dsl-core/src/main/groovy/javaposse/jobdsl/dsl/helpers/triggers/TriggerContext.groovy
@@ -6,11 +6,9 @@ import javaposse.jobdsl.dsl.Item
 import javaposse.jobdsl.dsl.JobManagement
 import javaposse.jobdsl.dsl.Preconditions
 import javaposse.jobdsl.dsl.RequiresPlugin
-import javaposse.jobdsl.dsl.ContextType
 import javaposse.jobdsl.dsl.helpers.common.Threshold
 import javaposse.jobdsl.dsl.helpers.triggers.GerritContext.GerritSpec
 
-@ContextType('hudson.triggers.Trigger')
 class TriggerContext extends ItemTriggerContext {
     TriggerContext(JobManagement jobManagement, Item item) {
         super(jobManagement, item)