Merge remote-tracking branch 'lvotypko/more-dsl-steps'

Author: daspilker

docs/Home.md

@@ -42,6 +42,9 @@ Browse the Jenkins issue tracker to see any [open issues](https://issues.jenkins
     ([JENKINS-51202](https://issues.jenkins-ci.org/browse/JENKINS-51202))
   * Fixed [[Dynamic DSL]] problem
     ([JENKINS-57817](https://issues.jenkins-ci.org/browse/JENKINS-57817))
+  * Fixed problems when using multiple Job DSL steps in a single seed job
+    ([JENKINS-29784](https://issues.jenkins-ci.org/browse/JENKINS-29784),
+    [JENKINS-44142](https://issues.jenkins-ci.org/browse/JENKINS-44142))
 * 1.74 (May 01 2019)
   * Fixed [Configuration as Code](https://github.com/jenkinsci/configuration-as-code-plugin/) extension
     ([JENKINS-57218](https://issues.jenkins-ci.org/browse/JENKINS-57218))

job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/ExecuteDslScripts.java

@@ -41,6 +41,7 @@
 import javaposse.jobdsl.plugin.actions.GeneratedUserContentsBuildAction;
 import javaposse.jobdsl.plugin.actions.GeneratedViewsAction;
 import javaposse.jobdsl.plugin.actions.GeneratedViewsBuildAction;
+import javaposse.jobdsl.plugin.actions.GeneratedObjectsRunAction;
 import jenkins.model.Jenkins;
 import jenkins.model.ParameterizedJobMixIn.ParameterizedJob;
 import jenkins.tasks.SimpleBuildStep;
@@ -357,17 +358,17 @@ public void perform(@Nonnull Run<?, ?> run, @Nonnull FilePath workspace, @Nonnul
                 Set<GeneratedConfigFile> freshConfigFiles = generatedItems.getConfigFiles();
                 Set<GeneratedUserContent> freshUserContents = generatedItems.getUserContents();
 
-                updateTemplates(run.getParent(), listener, freshJobs);
-                updateGeneratedJobs(run.getParent(), listener, freshJobs);
-                updateGeneratedViews(run.getParent(), listener, freshViews);
-                updateGeneratedConfigFiles(run.getParent(), listener, freshConfigFiles);
-                updateGeneratedUserContents(run.getParent(), listener, freshUserContents);
-
                 // Save onto Builder, which belongs to a Project.
-                run.addAction(new GeneratedJobsBuildAction(freshJobs, getLookupStrategy()));
-                run.addAction(new GeneratedViewsBuildAction(freshViews, getLookupStrategy()));
-                run.addAction(new GeneratedConfigFilesBuildAction(freshConfigFiles));
-                run.addAction(new GeneratedUserContentsBuildAction(freshUserContents));
+                addJobAction(run, new GeneratedJobsBuildAction(freshJobs, getLookupStrategy()));
+                addJobAction(run, new GeneratedViewsBuildAction(freshViews, getLookupStrategy()));
+                addJobAction(run, new GeneratedConfigFilesBuildAction(freshConfigFiles));
+                addJobAction(run, new GeneratedUserContentsBuildAction(freshUserContents));
+
+                updateTemplates(run.getParent(), listener, new HashSet<GeneratedJob>(run.getAction(GeneratedJobsBuildAction.class).getModifiedObjects()));
+                updateGeneratedJobs(run.getParent(), listener, new HashSet<GeneratedJob>(run.getAction(GeneratedJobsBuildAction.class).getModifiedObjects()));
+                updateGeneratedViews(run.getParent(), listener, new HashSet<GeneratedView>(run.getAction(GeneratedViewsBuildAction.class).getModifiedObjects()));
+                updateGeneratedConfigFiles(run.getParent(), listener, new HashSet<GeneratedConfigFile>(run.getAction(GeneratedConfigFilesBuildAction.class).getModifiedObjects()));
+                updateGeneratedUserContents(run.getParent(), listener, new HashSet<GeneratedUserContent>(run.getAction(GeneratedUserContentsBuildAction.class).getModifiedObjects()));
             }
         } catch (RuntimeException e) {
             if (!(e instanceof DslException) && !(e instanceof AccessDeniedException)) {
@@ -378,6 +379,16 @@ public void perform(@Nonnull Run<?, ?> run, @Nonnull FilePath workspace, @Nonnul
         }
     }
 
+    private void addJobAction(Run run, GeneratedObjectsRunAction action){
+        GeneratedObjectsRunAction generatedJobsBuildAction = run.getAction(action.getClass());
+        if (generatedJobsBuildAction == null) {
+            run.addAction(action);
+        }
+        else {
+            generatedJobsBuildAction.addModifiedObjects(action.getModifiedObjects());
+        }
+    }
+
     /**
      * Uses generatedJobs as existing data, so call before updating generatedJobs.
      */

job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/actions/GeneratedObjectsAction.groovy

@@ -19,6 +19,9 @@ abstract class GeneratedObjectsAction<T, B extends GeneratedObjectsRunAction<T>>
 
     Set<T> findLastGeneratedObjects() {
         for (Run run = job.lastBuild; run != null; run = run.previousBuild) {
+            if (run.isBuilding()) {
+                continue
+            }
             B action = run.getAction(buildActionClass)
             if (action != null && action.modifiedObjects != null) {
                 return action.modifiedObjects

job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/actions/GeneratedObjectsRunAction.java

@@ -46,4 +46,13 @@ public void onAttached(Run run) {
     public Collection<T> getModifiedObjects() {
         return modifiedObjects == null ? null : new TreeSet<>(modifiedObjects);
     }
+
+    public void addModifiedObjects(Collection<T> modifiedObjects) {
+        if (this.modifiedObjects == null) {
+            throw new IllegalStateException("Modified object should not be null. Probably wrong state after serialization/deserialization");
+        } else {
+            this.modifiedObjects.addAll(modifiedObjects);
+        }
+    }
+
 }

job-dsl-plugin/src/test/groovy/javaposse/jobdsl/plugin/ExecuteDslScriptsSpec.groovy

@@ -490,6 +490,43 @@ folder('folder-a/folder-b') {
         jenkinsRule.jenkins.getItemByFullName('test-job') == null
     }
 
+    def oneActionForMultipleStep() {
+        setup:
+        FreeStyleProject job = jenkinsRule.createFreeStyleProject('seed')
+
+        when:
+        List builders = []
+        builders.add(new ExecuteDslScripts('job("test-job")'))
+        builders.add(new ExecuteDslScripts('job("test-job2")'))
+        //builder1.removedJobAction = RemovedJobAction.DELETE
+        runBuild(job, builders)
+
+        then:
+        jenkinsRule.jenkins.getItemByFullName('seed').getActions(GeneratedJobsAction).size() == 1
+    }
+
+    def doNotGetRemoveJobActionFromRunningBuild() {
+        setup:
+        FreeStyleProject job = jenkinsRule.createFreeStyleProject('seed')
+
+        when:
+        List builders = []
+        builders.add(new ExecuteDslScripts('job("test-job")'))
+        builders.add(new ExecuteDslScripts('job("test-job2")'))
+        ExecuteDslScripts builder = new ExecuteDslScripts('job("test-job3")')
+        builder.removedJobAction = RemovedJobAction.DELETE
+        builders.add(builder)
+
+        runBuild(job, builders)
+        builders.remove(0)
+        runBuild(job, builders)
+
+        then:
+        jenkinsRule.jenkins.getItemByFullName('test-job2') != null
+        jenkinsRule.jenkins.getItemByFullName('test-job3') != null
+        jenkinsRule.jenkins.getItemByFullName('test-job') == null
+    }
+
     def deleteJobInFolder() {
         setup:
         jenkinsRule.jenkins.createProject(Folder, 'folder')
@@ -1856,6 +1893,16 @@ folder('folder-a/folder-b') {
         build
     }
 
+    private static FreeStyleBuild runBuild(FreeStyleProject job, List<ExecuteDslScripts> builders) {
+        job.buildersList.clear()
+        job.buildersList.addAll(builders)
+
+        FreeStyleBuild build = job.scheduleBuild2(0).get()
+
+        assert build.result == SUCCESS
+        build
+    }
+
     private static final class QIA extends QueueItemAuthenticator {
         private final String user
         private final String item