Merge pull request #66 from ikedam/feature/JENKINS-23084_SupportAbuso…

…luteInFileParameters [JENKINS-23084] support abusolute in file parameters
jenkinsci · May 31, 2014 · a8f32fc · a8f32fc
2 parents 6ffdde8 + 25ad533
commit a8f32fc
Show file tree

Hide file tree

Showing 3 changed files with 87 additions and 6 deletions.
diff --git a/src/main/java/hudson/plugins/parameterizedtrigger/FileBuildParameters.java b/src/main/java/hudson/plugins/parameterizedtrigger/FileBuildParameters.java
@@ -99,11 +99,6 @@ public Action getAction(AbstractBuild<?,?> build, TaskListener listener)
 		Collection<? extends AbstractBuild<?,?>> targetBuilds = getTargetBuilds(build);
 
 		for (AbstractBuild<?,?> targetBuild: targetBuilds) {
-			if (!targetBuild.getWorkspace().exists()) {
-				// This is a case that the workspace is already removed.
-				LOGGER.log(Level.WARNING, "workspace for {0} is already removed. skip.", targetBuild.getDisplayName());
-				continue;
-			}
 			values.addAll(extractAllValues(targetBuild, listener, allFiles));
 		}
 		//Values might be empty, in that case don't return anything.

diff --git a/...esources/hudson/plugins/parameterizedtrigger/FileBuildParameters/help-propertiesFile.html b/...esources/hudson/plugins/parameterizedtrigger/FileBuildParameters/help-propertiesFile.html
@@ -1,5 +1,6 @@
 <div>
-  Comma seperated list of paths to file(s) in the workspace that contains the parameters for the new project.
+  Comma seperated list of absolute or relative paths to file(s) that contains the parameters for the new project.
+  Relative paths are originated from the workspace.
   The file should have KEY=value pairs, one per line (Java properties file format).
   Backslashes are used for escaping, so use "\\" for a single backslash.
   <p/>

diff --git a/src/test/java/hudson/plugins/parameterizedtrigger/test/FileBuildTriggerConfigTest.java b/src/test/java/hudson/plugins/parameterizedtrigger/test/FileBuildTriggerConfigTest.java
@@ -23,6 +23,7 @@
  */
 package hudson.plugins.parameterizedtrigger.test;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.Arrays;
@@ -53,6 +54,7 @@
 import hudson.tasks.Builder;
 import hudson.util.FormValidation;
 
+import org.apache.commons.io.FileUtils;
 import org.jvnet.hudson.test.CaptureEnvironmentBuilder;
 import org.jvnet.hudson.test.Bug;
 import org.jvnet.hudson.test.HudsonTestCase;
@@ -747,4 +749,87 @@ public void testMatrixBuildsConfiguration() throws Exception {
         assertEquals("axis1=value1", p.getCombinationFilter());
         assertTrue(p.isOnlyExactRuns());
     }
+
+    public void testAbsolutePath() throws Exception {
+        FreeStyleProject downstream = createFreeStyleProject();
+
+        FreeStyleProject upstream = createFreeStyleProject();
+
+        File absoluteFile = new File(jenkins.getRootDir(), "properties.txt");
+        if(!absoluteFile.getParentFile().exists()) {
+            FileUtils.forceMkdir(absoluteFile.getParentFile());
+        }
+        FileUtils.writeStringToFile(absoluteFile, "absolute_param=value1");
+
+        File workspace = new File(jenkins.getWorkspaceFor(upstream).getRemote());
+        File relativeDir = workspace.getParentFile();
+
+        if(!relativeDir.exists()) {
+            FileUtils.forceMkdir(relativeDir);
+        }
+        File relativeFile = new File(relativeDir, "properties.txt");
+        FileUtils.writeStringToFile(relativeFile, "relative_param1=value2");
+
+        upstream.getBuildersList().add(new WriteFileBuilder("properties.txt", "relative_param2=value3"));
+        upstream.getPublishersList().add(new BuildTrigger(
+                new BuildTriggerConfig(downstream.getFullName(), ResultCondition.SUCCESS, true, Arrays.<AbstractBuildParameters>asList(
+                        new FileBuildParameters(String.format("%s,../properties.txt,properties.txt", absoluteFile.getAbsolutePath()))
+                ))
+        ));
+
+        jenkins.rebuildDependencyGraph();
+
+        assertBuildStatusSuccess(upstream.scheduleBuild2(0));
+        waitUntilNoActivity();
+
+        FreeStyleBuild build = downstream.getLastBuild();
+        assertNotNull(build);
+        assertEquals("value1", getStringParameterValue(build, "absolute_param"));
+        assertEquals("value2", getStringParameterValue(build, "relative_param1"));
+        assertEquals("value3", getStringParameterValue(build, "relative_param2"));
+    }
+
+    /**
+     * Builder that removes a workspace.
+     */
+    private static class WorkspaceRemoveBuilder extends Builder {
+        @Override
+        public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListener listener)
+                throws InterruptedException, IOException
+        {
+            build.getWorkspace().deleteRecursive();
+            return true;
+        }
+    }
+
+    @Bug(22229)
+    public void testAbsolutePathWithoutWorkspace() throws Exception {
+        // Though it is rather a problem with ws-cleanup-plugin, 
+        // there's a case a workspace is removed.
+        FreeStyleProject downstream = createFreeStyleProject();
+
+        FreeStyleProject upstream = createFreeStyleProject();
+
+        File absoluteFile = new File(jenkins.getRootDir(), "properties.txt");
+        if(!absoluteFile.getParentFile().exists()) {
+            FileUtils.forceMkdir(absoluteFile.getParentFile());
+        }
+        FileUtils.writeStringToFile(absoluteFile, "absolute_param=value1");
+
+        upstream.getBuildersList().add(new WorkspaceRemoveBuilder());
+        upstream.getPublishersList().add(new BuildTrigger(
+                new BuildTriggerConfig(downstream.getFullName(), ResultCondition.SUCCESS, true, Arrays.<AbstractBuildParameters>asList(
+                        new FileBuildParameters(absoluteFile.getAbsolutePath())
+                ))
+        ));
+
+        jenkins.rebuildDependencyGraph();
+
+        assertBuildStatusSuccess(upstream.scheduleBuild2(0));
+        waitUntilNoActivity();
+
+        FreeStyleBuild build = downstream.getLastBuild();
+        assertNotNull(build);
+        assertEquals("value1", getStringParameterValue(build, "absolute_param"));
+    }
 }