Merge branch 'JENKINS-53840'

Author: daspilker

docs/Home.md

@@ -33,6 +33,8 @@ Browse the Jenkins issue tracker to see any [open issues](https://issues.jenkins
 
 ## Release Notes
 * 1.77 (unreleased)
+  * Fixed problem with paths on Windows
+    ([JENKINS-53840](https://issues.jenkins-ci.org/browse/JENKINS-53840))
 * 1.76 (August 22 2019)
   * Added documentation for pitfalls when using multiple Job DSL build steps in a single job
     ([JENKINS-44142](https://issues.jenkins-ci.org/browse/JENKINS-44142))

job-dsl-plugin/src/main/groovy/javaposse/jobdsl/plugin/ScriptRequestGenerator.groovy

@@ -70,7 +70,7 @@ class ScriptRequestGenerator implements Closeable {
     @PackageScope
     static String getAbsolutePath(FilePath filePath) {
         // see JENKINS-33723
-        filePath.getRemote()
+        FilenameUtils.normalize(filePath.getRemote(), true)
     }
 
     private URL createClasspathURL(FilePath filePath) {
@@ -96,7 +96,6 @@ class ScriptRequestGenerator implements Closeable {
 
     private URL createWorkspaceUrl(FilePath filePath) {
         String relativePath = getAbsolutePath(filePath) - getAbsolutePath(workspace)
-        relativePath = relativePath.replaceAll('\\\\', '/') // normalize for Windows
         String slash = filePath.directory ? '/' : ''
         new URL(createWorkspaceUrl(), "$relativePath$slash")
     }

job-dsl-plugin/src/test/groovy/javaposse/jobdsl/plugin/ScriptRequestGeneratorSpec.groovy

@@ -8,6 +8,8 @@ import javaposse.jobdsl.dsl.DslException
 import javaposse.jobdsl.dsl.ScriptRequest
 import org.junit.ClassRule
 import org.jvnet.hudson.test.JenkinsRule
+import hudson.FilePath
+import spock.lang.Requires
 import spock.lang.Shared
 import spock.lang.Specification
 import spock.lang.Unroll
@@ -402,4 +404,26 @@ class ScriptRequestGeneratorSpec extends Specification {
         then:
         requests.empty
     }
+
+    @Requires({ os.isWindows() })
+    def 'allow differing separators in base path of workspace and target (on Windows)'() {
+        setup:
+        EnvVars env = new EnvVars()
+        // input a workspace that has forward slash separators where the target will get backward slashes
+        String crookedRemote = build.workspace.remote.replace('\\', '/')
+        FilePath customWorkspace = new FilePath(new FilePath(new File('')), crookedRemote)
+        ScriptRequestGenerator generator = new ScriptRequestGenerator(customWorkspace, env)
+
+        when:
+        List<ScriptRequest> requests = generator.getScriptRequests('a.groovy', false, null, false, null).toList()
+
+        then:
+        requests.size() == 1
+        requests[0].body == SCRIPT_A
+        requests[0].urlRoots.length == 1
+        requests[0].urlRoots[0].toString() == 'workspace:/'
+        !requests[0].ignoreExisting
+        requests[0].scriptPath == getAbsolutePath(build.workspace.child('a.groovy'))
+        requests[0].relativeScriptPath == 'a.groovy'
+    }
 }