[FIXED JENKINS-34246] Make AbstractWorkflowMultiBranchProjectFactory …

…handle deletion or update of existing children.
jenkinsci · Jun 8, 2016 · a7d63ec · a7d63ec
1 parent 04d9355
commit a7d63ec
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -84,7 +84,7 @@ THE SOFTWARE.
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>branch-api</artifactId>
-            <version>1.9</version>
+            <version>1.10-SNAPSHOT</version> <!-- TODO https://github.com/jenkinsci/branch-api-plugin/pull/45 -->
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>

diff --git a/...org/jenkinsci/plugins/workflow/multibranch/AbstractWorkflowMultiBranchProjectFactory.java b/...org/jenkinsci/plugins/workflow/multibranch/AbstractWorkflowMultiBranchProjectFactory.java
@@ -28,9 +28,12 @@
 import hudson.model.Action;
 import hudson.model.Item;
 import hudson.model.ItemGroup;
+import hudson.model.TaskListener;
+import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
+import jenkins.branch.MultiBranchProject;
 import jenkins.branch.MultiBranchProjectFactory;
 import jenkins.branch.OrganizationFolder;
 import jenkins.model.TransientActionFactory;
@@ -47,6 +50,12 @@ public abstract class AbstractWorkflowMultiBranchProjectFactory extends MultiBra
         return project;
     }
 
+    @Override public final void updateExistingProject(MultiBranchProject<?, ?> project, Map<String, Object> attributes, TaskListener listener) throws IOException, InterruptedException {
+        if (project instanceof WorkflowMultiBranchProject) {
+            customize((WorkflowMultiBranchProject) project);
+        } // otherwise got recognized by something else before, oh well
+    }
+
     protected void customize(WorkflowMultiBranchProject project) {}
 
     @Extension public static class PerFolderAdder extends TransientActionFactory<OrganizationFolder> {

diff --git a/...ava/org/jenkinsci/plugins/workflow/multibranch/WorkflowMultiBranchProjectFactoryTest.java b/...ava/org/jenkinsci/plugins/workflow/multibranch/WorkflowMultiBranchProjectFactoryTest.java
@@ -115,6 +115,12 @@ public class WorkflowMultiBranchProjectFactoryTest {
         b1 = p.getLastBuild();
         assertEquals(1, b1.getNumber());
         r.assertLogContains("ran two", b1);
+        // JENKINS-34246: also delete Jenkinsfile
+        sampleRepo2.git("rm", WorkflowBranchProjectFactory.SCRIPT);
+        sampleRepo2.git("commit", "--message=noflow");
+        top.scheduleBuild2(0).getFuture().get();
+        top.getComputation().writeWholeLogTo(System.out);
+        assertEquals(1, top.getItems().size());
     }
 
 }