Merge pull request #759 from redlab/JENKINS-17508

[FIXED JENKINS-17508] Artifacts not being deleted by LogRotator

maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java

@@ -398,6 +398,14 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
                 build.delete();
     }
 
+    @Override
+    public synchronized void deleteArtifacts() throws IOException {
+    	super.deleteArtifacts();
+    	for (List<MavenBuild> list : getModuleBuilds().values())
+            for (MavenBuild build : list)
+                build.deleteArtifacts();
+    }
+    
     @Override
     public Object getDynamic(String token, StaplerRequest req, StaplerResponse rsp) {
         // map corresponding module build under this object

test/src/test/java/hudson/maven/MavenMultiModuleLogRotatorCleanArtifactsTest.java

+/**
+ * 
+ */
+package hudson.maven;
+
+import hudson.FilePath;
+import hudson.Launcher;
+import hudson.maven.reporters.MavenFingerprinter;
+import hudson.model.BuildListener;
+import hudson.tasks.LogRotator;
+import hudson.tasks.Maven.MavenInstallation;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.Bug;
+import org.jvnet.hudson.test.ExtractResourceWithChangesSCM;
+import org.jvnet.hudson.test.For;
+import org.jvnet.hudson.test.JenkinsRule;
+
+/**
+ * 
+ * Test that looks in jobs archive with 2 builds. When LogRotator set as build
+ * discarder with settings to keep only 1 build with artifacts, test searches
+ * for jars in archive for build one and build two, expecting no jars in build 1
+ * and expecting jars in build 2.
+ * 
+ * 
+ */
+public class MavenMultiModuleLogRotatorCleanArtifactsTest {
+
+	
+	@Rule
+	public JenkinsRule j = new JenkinsRule();
+	private MavenModuleSet m;
+	private FilePath jobs;
+
+	private static class TestReporter extends MavenReporter {
+		/**
+		 * 
+		 */
+		private static final long serialVersionUID = 1L;
+
+		@Override
+		public boolean end(MavenBuild build, Launcher launcher,
+				BuildListener listener) throws InterruptedException,
+				IOException {
+			Assert.assertNotNull(build.getProject().getSomeWorkspace());
+			Assert.assertNotNull(build.getWorkspace());
+			return true;
+		}
+	}
+
+	@Before
+	public void setUp() throws Exception {
+		j.configureDefaultMaven("apache-maven-2.2.1", MavenInstallation.MAVEN_21);
+		m = j.createMavenProject();
+		m.setBuildDiscarder(new LogRotator("-1", "2", "-1", "1"));
+		m.getReporters().add(new TestReporter());
+		m.getReporters().add(new MavenFingerprinter());
+		m.setScm(new ExtractResourceWithChangesSCM(getClass().getResource(
+				"maven-multimod.zip"), getClass().getResource(
+				"maven-multimod-changes.zip")));
+		j.buildAndAssertSuccess(m);
+		// Now run a second build with the changes.
+		m.setIncrementalBuild(false);
+		j.buildAndAssertSuccess(m);
+		FilePath workspace = m.getSomeWorkspace();
+		FilePath parent = workspace.getParent().getParent();
+		jobs = new FilePath(parent, "jobs");
+	}
+	
+	@Test
+	@Bug(17508)
+	@For({MavenModuleSetBuild.class, LogRotator.class})
+	@SuppressWarnings("unchecked")
+	public void testArtifactsAreDeletedInBuildOneWhenBuildDiscarderRun()
+			throws Exception {
+		File directory = new File(new FilePath(jobs, "test0/builds/1").getRemote());
+		Collection<File> files = FileUtils.listFiles(directory,
+				new String[] { "jar" }, true);
+		Assert.assertTrue(
+				"Found jars in previous build, that should not happen",
+				files.isEmpty());
+		Collection<File> files2 = FileUtils.listFiles(new File(new FilePath(
+				jobs, "test0/builds/2").getRemote()), new String[] { "jar" }, true);
+		Assert.assertFalse("No jars in last build ALERT!", files2.isEmpty());
+	}
+
+	/**
+	 * Performs a third build and expecting build one to be deleted
+	 * @throws Exception
+	 */
+	@For({MavenModuleSetBuild.class, LogRotator.class})
+	@Test
+	public void testArtifactsOldBuildsDeletedWhenBuildDiscarderRun()
+			throws Exception {
+		j.buildAndAssertSuccess(m);
+		File directory = new File(new FilePath(jobs, "test0/builds/1").getRemote());
+		Assert.assertFalse("oops the build should have been deleted", directory.exists());
+	}
+
+}