JENKINS-7010: Maven settings configured at Maven job level aren't use…

…d inside the promotion step - Add test case to demonstrate the issue
jenkinsci · Oct 23, 2015 · bd76d48 · bd76d48
1 parent 823106e
commit bd76d48
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -433,6 +433,12 @@ THE SOFTWARE.
       <version>1.0</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>promoted-builds</artifactId>
+      <version>2.23</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/src/test/java/hudson/maven/RedeployPublisherTest.java b/src/test/java/hudson/maven/RedeployPublisherTest.java
@@ -24,21 +24,23 @@
 package hudson.maven;
 
 import hudson.model.Result;
+import hudson.plugins.promoted_builds.JobPropertyImpl;
+import hudson.plugins.promoted_builds.PromotedBuildAction;
+import hudson.plugins.promoted_builds.PromotionProcess;
+import hudson.plugins.promoted_builds.conditions.SelfPromotionCondition;
+import hudson.plugins.promoted_builds.tasks.RedeployBatchTaskPublisher;
 import hudson.tasks.Maven.MavenInstallation;
 import java.io.File;
 import java.io.FilenameFilter;
+import java.net.URL;
 import java.util.Arrays;
+import jenkins.mvn.FilePathSettingsProvider;
 import org.apache.commons.lang.StringUtils;
 import static org.junit.Assert.*;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-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.RandomlyFails;
-import org.jvnet.hudson.test.SingleFileSCM;
+import org.jvnet.hudson.test.*;
 
 /**
  * @author Kohsuke Kawaguchi
@@ -253,4 +255,53 @@ public void testDeployUnstable() throws Exception {
         assertTrue("Artifact should have been published even when the build is unstable",
                    new File(repo,"test/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT.jar").exists());
     }
+
+    @Bug(7010)
+    @Test
+    public void testSettingsInsidePromotion() throws Exception {
+        j.configureDefaultMaven();
+        MavenModuleSet m2 = j.createMavenProject();
+        File repo = tmp.getRoot();
+        URL resource = RedeployPublisherTest.class.getResource("settings.xml");
+        File customUserSettings = new File(resource.toURI().getPath());
+
+        // Let's configure a maven build with a custom settings.xml file
+        m2.setScm(new SingleFileSCM("pom.xml", getClass().getResource("simple-pom.xml")));
+        m2.setSettings(new FilePathSettingsProvider(customUserSettings.getAbsolutePath()));
+
+        // Let's configure a promotion step automatically executed after the build and launching a RedeployBatchTaskPublisher
+        JobPropertyImpl property = new JobPropertyImpl(m2);
+        PromotionProcess promotionProcess = property.addProcess("deploy");
+        promotionProcess.conditions.add(new SelfPromotionCondition(false));
+        promotionProcess.getBuildSteps().add(new RedeployBatchTaskPublisher("", repo.toURI().toString(), false));
+        m2.addProperty(property);
+
+        // Let's launch the build
+        MavenModuleSetBuild b = m2.scheduleBuild2(0).get();
+        // It should pass
+        j.assertBuildStatus(Result.SUCCESS, b);
+
+        // Let's verify the promotion
+        PromotedBuildAction promotedBuildAction = b.getAction(PromotedBuildAction.class);
+
+        while (promotedBuildAction.getPromotion("deploy").getLast() == null ||
+                promotedBuildAction.getPromotion("deploy").getLast().isBuilding()) {
+            // Let's wait for the end of the promotion
+            Thread.sleep(100);
+        }
+
+        // We should have one promotion
+        assertEquals("1 promotion expected", 1, promotedBuildAction.getPromotions().size());
+
+        // The promotion should succeed
+        assertEquals("promotion succeeded", Result.SUCCESS, promotedBuildAction.getPromotion("deploy").getLast().getResult());
+
+        // It should have deployed the artifact
+        assertTrue("Artifact should have been published",
+                new File(repo,"test/maven/simple-pom/1.0-SNAPSHOT/simple-pom-1.0-SNAPSHOT.pom").exists());
+        // The RedeployPublisher should display the information that it used the custom settings.xml file
+        // There is no easy solution to test that the custom settings are used excepted the log
+        j.assertLogContains(customUserSettings.getAbsolutePath(),promotedBuildAction.getPromotion("deploy").getLast());
+
+    }
 }
diff --git a/src/test/resources/hudson/maven/settings.xml b/src/test/resources/hudson/maven/settings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                      http://maven.apache.org/xsd/settings-1.0.0.xsd">
+</settings>
diff --git a/src/test/resources/hudson/maven/simple-pom.xml b/src/test/resources/hudson/maven/simple-pom.xml
@@ -0,0 +1,12 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>test.maven</groupId>
+  <artifactId>simple-pom</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <name>simple-pom</name>
+
+</project>