[FIXED JENKINS-19764] Ensure parent dir of new builds dir exists.

jenkinsci · Aug 21, 2014 · 7f4014c · 7f4014c
1 parent fd77294
commit 7f4014c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java
@@ -619,6 +619,9 @@ public void renameTo(String newName) throws IOException {
         super.renameTo(newName);
         File newBuildDir = getBuildDir();
         if (oldBuildDir.isDirectory() && !newBuildDir.isDirectory()) {
+            if (!newBuildDir.getParentFile().isDirectory()) {
+                newBuildDir.getParentFile().mkdirs();
+            }
             if (!oldBuildDir.renameTo(newBuildDir)) {
                 throw new IOException("failed to rename " + oldBuildDir + " to " + newBuildDir);
             }

diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
@@ -2014,6 +2014,11 @@ public String getRawBuildsDir() {
         return buildsDir;
     }
 
+    @Restricted(NoExternalUse.class)
+    public void setRawBuildsDir(String buildsDir) {
+        this.buildsDir = buildsDir;
+    }
+
     public FilePath getRootPath() {
         return new FilePath(getRootDir());
     }

diff --git a/test/src/test/java/hudson/model/JobTest.java b/test/src/test/java/hudson/model/JobTest.java
@@ -277,4 +277,12 @@ private static void tryConfigDotXml(JenkinsRule.WebClient wc, int status, String
         }).intValue());
     }
 
+    @Bug(19764)
+    @Test public void testRenameWithCustomBuildsDirWithSubdir() throws Exception {
+        j.jenkins.setRawBuildsDir("${JENKINS_HOME}/builds/${ITEM_FULL_NAME}/builds");
+        final FreeStyleProject p = j.createFreeStyleProject();
+        p.scheduleBuild2(0).get();
+        p.renameTo("different-name");
+    }
+
 }