Merge pull request #85 from stephenc/jenkins-42000

[JENKINS-42000] Communication errors in organization scanning should not delete all everything
jenkinsci · Feb 14, 2017 · 76313ec · 76313ec
2 parents 0178b37 + 0205467
commit 76313ec
Show file tree

Hide file tree

Showing 3 changed files with 111 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>2.19</version>
+    <version>2.22</version>
     <relativePath />
   </parent>
 
@@ -66,7 +66,7 @@
 
   <properties>
     <jenkins.version>1.642.3</jenkins.version>
-    <scm-api.version>2.0.3</scm-api.version>
+    <scm-api.version>2.0.4</scm-api.version>
   </properties>
 
   <repositories>

diff --git a/src/main/java/jenkins/branch/OrganizationFolder.java b/src/main/java/jenkins/branch/OrganizationFolder.java
@@ -1194,7 +1194,7 @@ private boolean recognizes(Map<String, Object> attributes, MultiBranchProjectFac
                 }
 
                 @Override
-                public void complete() throws IllegalStateException, InterruptedException {
+                public void complete() throws IllegalStateException, IOException, InterruptedException {
                     try {
                         MultiBranchProjectFactory factory = null;
                         Map<String, Object> attributes = Collections.<String, Object>emptyMap();
@@ -1257,7 +1257,7 @@ public void complete() throws IllegalStateException, InterruptedException {
                         }
                         observer.created(project);
                         project.scheduleBuild();
-                    } catch (InterruptedException x) {
+                    } catch (InterruptedException | IOException x) {
                         throw x;
                     } catch (Exception x) {
                         x.printStackTrace(listener.error("Failed to create or update a subproject " + projectName));

diff --git a/src/test/java/integration/EventsTest.java b/src/test/java/integration/EventsTest.java
@@ -1203,6 +1203,113 @@ public void given_orgFolder_when_someReposMatch_then_scanCreatesMatchingProjects
         }
     }
 
+    @Test
+    @Issue("JENKINS-42000")
+    public void given_orgFolder_when_navigatorIoErrorScanning_then_scanRecordedAsFailure() throws Exception {
+        try (MockSCMController c = MockSCMController.create()) {
+            OrganizationFolder prj = r.jenkins.createProject(OrganizationFolder.class, "foo");
+            prj.getSCMNavigators().add(new MockSCMNavigator(c, true, false, false));
+            prj.getProjectFactories().replaceBy(Collections
+                    .singletonList(new BasicMultiBranchProjectFactory(new BasicSCMSourceCriteria("marker.txt"))));
+            c.createRepository("foo");
+            c.createRepository("bar");
+            c.createRepository("manchu");
+            c.addFile("foo", "master", "adding marker", "marker.txt", "A marker".getBytes());
+            c.addFile("bar", "master", "adding marker", "marker.txt", "A marker".getBytes());
+            c.addFile("manchu", "master", "adding marker", "marker.txt", "A marker".getBytes());
+            prj.scheduleBuild2(0).getFuture().get();
+            r.waitUntilNoActivity();
+            assertThat(prj.getComputation().getResult(), is(Result.SUCCESS));
+            assertThat("A scan picks up a newly qualified repo",
+                    prj.getItems(),
+                    not(is((Collection<MultiBranchProject<?, ?>>) Collections.<MultiBranchProject<?, ?>>emptyList())));
+            BasicMultiBranchProject foo = (BasicMultiBranchProject) prj.getItem("foo");
+            BasicMultiBranchProject bar = (BasicMultiBranchProject) prj.getItem("bar");
+            BasicMultiBranchProject manchu = (BasicMultiBranchProject) prj.getItem("manchu");
+            assertThat("We now have the `foo` project", foo, notNullValue());
+            assertThat("We now have the `bar` project", bar, notNullValue());
+            assertThat("We now have the `manchu` project", manchu, notNullValue());
+            assertThat("We now have only the projects expected",
+                    prj.getItems(),
+                    Matchers.<MultiBranchProject<?, ?>>containsInAnyOrder(foo, bar, manchu));
+            c.addFault(new MockFailure() {
+                @Override
+                public void check(@CheckForNull String repository, @CheckForNull String branchOrCR,
+                                  @CheckForNull String revision,
+                                  boolean actions) throws IOException {
+                    if ("bar".equals(repository) && branchOrCR == null && revision == null && !actions) {
+                        throw new IOException("Boom Boom Boom!!!");
+                    }
+                }
+            });
+            prj.scheduleBuild2(0).getFuture().get();
+            r.waitUntilNoActivity();
+            assertThat(prj.getComputation().getResult(), is(Result.FAILURE));
+            foo = (BasicMultiBranchProject) prj.getItem("foo");
+            bar = (BasicMultiBranchProject) prj.getItem("bar");
+            manchu = (BasicMultiBranchProject) prj.getItem("manchu");
+            assertThat("We now have the `foo` project", foo, notNullValue());
+            assertThat("We now have the `bar` project", bar, notNullValue());
+            assertThat("We now have the `manchu` project", manchu, notNullValue());
+            assertThat("We now have only the projects expected",
+                    prj.getItems(),
+                    Matchers.<MultiBranchProject<?, ?>>containsInAnyOrder(foo, bar, manchu));
+        }
+    }
+
+    @Test
+    @Issue("JENKINS-42000")
+    public void given_orgFolder_when_sourceIoErrorScanning_then_scanRecordedAsFailure() throws Exception {
+        try (MockSCMController c = MockSCMController.create()) {
+            OrganizationFolder prj = r.jenkins.createProject(OrganizationFolder.class, "foo");
+            prj.getSCMNavigators().add(new MockSCMNavigator(c, true, false, false));
+            prj.getProjectFactories().replaceBy(Collections
+                    .singletonList(new BasicMultiBranchProjectFactory(new BasicSCMSourceCriteria("marker.txt"))));
+            c.createRepository("foo");
+            c.createRepository("bar");
+            c.createRepository("manchu");
+            c.addFile("foo", "master", "adding marker", "marker.txt", "A marker".getBytes());
+            c.addFile("bar", "master", "adding marker", "marker.txt", "A marker".getBytes());
+            c.addFile("manchu", "master", "adding marker", "marker.txt", "A marker".getBytes());
+            prj.scheduleBuild2(0).getFuture().get();
+            r.waitUntilNoActivity();
+            assertThat("A scan picks up a newly qualified repo",
+                    prj.getItems(),
+                    not(is((Collection<MultiBranchProject<?, ?>>) Collections.<MultiBranchProject<?, ?>>emptyList())));
+            BasicMultiBranchProject foo = (BasicMultiBranchProject) prj.getItem("foo");
+            BasicMultiBranchProject bar = (BasicMultiBranchProject) prj.getItem("bar");
+            BasicMultiBranchProject manchu = (BasicMultiBranchProject) prj.getItem("manchu");
+            assertThat("We now have the `foo` project", foo, notNullValue());
+            assertThat("We now have the `bar` project", bar, notNullValue());
+            assertThat("We now have the `manchu` project", manchu, notNullValue());
+            assertThat("We now have only the projects expected",
+                    prj.getItems(),
+                    Matchers.<MultiBranchProject<?, ?>>containsInAnyOrder(foo, bar, manchu));
+            c.addFault(new MockFailure() {
+                @Override
+                public void check(@CheckForNull String repository, @CheckForNull String branchOrCR,
+                                  @CheckForNull String revision,
+                                  boolean actions) throws IOException {
+                    if ("bar".equals(repository) && branchOrCR != null && revision == null && !actions) {
+                        throw new IOException("Boom Boom Boom!!!");
+                    }
+                }
+            });
+            prj.scheduleBuild2(0).getFuture().get();
+            r.waitUntilNoActivity();
+            assertThat(prj.getComputation().getResult(), is(Result.FAILURE));
+            foo = (BasicMultiBranchProject) prj.getItem("foo");
+            bar = (BasicMultiBranchProject) prj.getItem("bar");
+            manchu = (BasicMultiBranchProject) prj.getItem("manchu");
+            assertThat("We now have the `foo` project", foo, notNullValue());
+            assertThat("We now have the `bar` project", bar, notNullValue());
+            assertThat("We now have the `manchu` project", manchu, notNullValue());
+            assertThat("We now have only the projects expected",
+                    prj.getItems(),
+                    Matchers.<MultiBranchProject<?, ?>>containsInAnyOrder(foo, bar, manchu));
+        }
+    }
+
     @Test
     public void given_orgFolder_when_someReposMatch_then_eventCreatesMatchingProject() throws Exception {
         try (MockSCMController c = MockSCMController.create()) {