[JENKINS-28147] Perform Environment tearDown if BuildWrapper signals …

…error
jenkinsci · May 18, 2015 · 8cec5cd · 8cec5cd
1 parent f32d192
commit 8cec5cd
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 0 deletions.
diff --git a/src/main/java/hudson/maven/MavenBuild.java b/src/main/java/hudson/maven/MavenBuild.java
@@ -789,6 +789,15 @@ protected Result doRun(BuildListener listener) throws Exception {
             for (BuildWrapper w : mms.getBuildWrappersList()) {
                 Environment e = w.setUp(MavenBuild.this, launcher, listener);
                 if (e == null) {
+                    for(int i = buildEnvironments.size()-1; i>=0; i--) {
+                        Environment environment = buildEnvironments.get(i);
+                        try {
+                        	environment.tearDown(MavenBuild.this, slistener);
+                        } catch (Exception ignored) {
+                        	// exceptions are ignored to give a chance to all environments to tear down
+                        }
+                    }
+
                     return Result.FAILURE;
                 }
                 buildEnvironments.add(e);

diff --git a/src/test/java/hudson/maven/MavenBuildTest.java b/src/test/java/hudson/maven/MavenBuildTest.java
@@ -4,8 +4,10 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertNotNull;
+import hudson.Extension;
 import hudson.Launcher;
 import hudson.maven.MavenBuildProxy.BuildCallable;
+import hudson.model.AbstractBuild;
 import hudson.model.AbstractProject;
 import hudson.model.Action;
 import hudson.model.BallColor;
@@ -14,28 +16,36 @@
 import hudson.model.ParametersDefinitionProperty;
 import hudson.model.Result;
 import hudson.model.StringParameterDefinition;
+import hudson.tasks.BuildWrapper;
+import hudson.tasks.BuildWrapperDescriptor;
 import hudson.tasks.Builder;
+import hudson.tasks.BuildWrapper.Environment;
 import hudson.tasks.Maven.MavenInstallation;
 import hudson.tasks.test.AbstractTestResultAction;
 import hudson.tasks.test.AggregatedTestResultAction;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
 import javax.servlet.ServletException;
 
+import net.sf.json.JSONObject;
+
 import org.apache.maven.project.MavenProject;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.Bug;
 import org.jvnet.hudson.test.Email;
 import org.jvnet.hudson.test.ExtractResourceSCM;
 import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.JenkinsRule.TestBuildWrapper;
 import org.jvnet.hudson.test.SingleFileSCM;
+import org.kohsuke.stapler.StaplerRequest;
 
 /**
  * @author Kohsuke Kawaguchi
@@ -357,6 +367,23 @@ public void testActionsOfPreAndPostBuildersMustBeExposed() throws Exception {
         final List<TestAction> actions = m.getActions(TestAction.class);
         assertEquals(2, actions.size());
     }     
+
+    @Test
+    public void testBuildWrappersTeardown() throws Exception {
+        j.configureDefaultMaven();
+        MavenModuleSet m = j.createMavenProject();
+        m.setScm(new ExtractResourceSCM(getClass().getResource("multimodule-maven.zip")));
+        m.setGoals("initialize");
+
+        TearingDownBuildWrapper testBuild1Wrapper = new TearingDownBuildWrapper();
+        TearingDownBuildWrapper testBuild2Wrapper = new TearingDownBuildWrapper();
+		m.getBuildWrappersList().addAll(Arrays.asList(testBuild1Wrapper, testBuild2Wrapper, new FailingBuildWrapper()));
+
+        j.assertBuildStatus(Result.FAILURE, m.scheduleBuild2(0).get());
+
+        assertTrue(testBuild1Wrapper.tearDown);
+        assertTrue(testBuild2Wrapper.tearDown);
+    } 
 
     private static class TestBuilder extends Builder {
 
@@ -380,4 +407,27 @@ public boolean projectActionsGotRequested() {
     private static class TestAction extends InvisibleAction{
     }
 
+    private static class FailingBuildWrapper extends BuildWrapper {
+        @Override
+        public Environment setUp(AbstractBuild build, Launcher launcher, BuildListener listener) throws IOException, InterruptedException {
+        	return null;
+        }
+    }
+
+    private static class TearingDownBuildWrapper extends BuildWrapper {
+        public boolean tearDown;
+
+		@Override
+        public Environment setUp(AbstractBuild build, Launcher launcher, BuildListener listener) throws IOException, InterruptedException {
+        	return new Environment() {
+        		public boolean tearDown(AbstractBuild build, BuildListener listener) {
+        			tearDown = true;
+
+        			return true;
+        		}
+        	};
+        }
+
+
+    }
 }