From d98716dfbad96f566938b90a5a8b50ce9765575b Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Fri, 8 Mar 2013 20:43:49 -0500
Subject: [PATCH] [FIXED JENKINS-17138] Deleting/renaming jobs using external
 builds directory does not move builds.

---
 changelog.html                                |  3 +++
 core/src/main/java/hudson/model/Job.java      | 12 +++++++++++
 .../hudson/model/AbstractProjectTest.java     | 20 +++++++++++++++++++
 3 files changed, 35 insertions(+)

diff --git a/changelog.html b/changelog.html
index 79569d9a67..9d46e22d6a 100644
--- a/changelog.html
+++ b/changelog.html
@@ -67,6 +67,9 @@ Upcoming changes</a>
   <li class=bug>
     Permalinks created in the wrong place when using external build directories.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-17137">issue 17137</a>)
+  <li class=bug>
+    External build directories not updated by job rename/delete.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-17138">issue 17138</a>)
   <li class=bug>
     JNA-related error from Windows slave monitoring thrown repeatedly.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15796">issue 15796</a>)
diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java
index 78fe42d8ba..bad60d378c 100644
--- a/core/src/main/java/hudson/model/Job.java
+++ b/core/src/main/java/hudson/model/Job.java
@@ -573,7 +573,19 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
      */
     @Override
     public void renameTo(String newName) throws IOException {
+        File oldBuildDir = getBuildDir();
         super.renameTo(newName);
+        File newBuildDir = getBuildDir();
+        if (oldBuildDir.isDirectory() && !newBuildDir.isDirectory()) {
+            if (!oldBuildDir.renameTo(newBuildDir)) {
+                throw new IOException("failed to rename " + oldBuildDir + " to " + newBuildDir);
+            }
+        }
+    }
+
+    @Override public synchronized void delete() throws IOException, InterruptedException {
+        super.delete();
+        Util.deleteRecursive(getBuildDir());
     }
 
     /**
diff --git a/test/src/test/java/hudson/model/AbstractProjectTest.java b/test/src/test/java/hudson/model/AbstractProjectTest.java
index 75776b5c66..c62e39717c 100644
--- a/test/src/test/java/hudson/model/AbstractProjectTest.java
+++ b/test/src/test/java/hudson/model/AbstractProjectTest.java
@@ -354,4 +354,24 @@ public class AbstractProjectTest extends HudsonTestCase {
         assertFalse(link.exists());
     }
 
+    @Bug(17138)
+    public void testExternalBuildDirectoryRenameDelete() throws Exception {
+        HtmlForm form = new WebClient().goTo("configure").getFormByName("config");
+        File builds = createTmpDir();
+        form.getInputByName("_.rawBuildsDir").setValueAttribute(builds + "/${ITEM_FULL_NAME}");
+        submit(form);
+        assertEquals(builds + "/${ITEM_FULL_NAME}", jenkins.getRawBuildsDir());
+        FreeStyleProject p = jenkins.createProject(MockFolder.class, "d").createProject(FreeStyleProject.class, "prj");
+        FreeStyleBuild b = p.scheduleBuild2(0).get();
+        File oldBuildDir = new File(builds, "d/prj");
+        assertEquals(new File(oldBuildDir, b.getId()), b.getRootDir());
+        assertTrue(b.getRootDir().isDirectory());
+        p.renameTo("proj");
+        File newBuildDir = new File(builds, "d/proj");
+        assertEquals(new File(newBuildDir, b.getId()), b.getRootDir());
+        assertTrue(b.getRootDir().isDirectory());
+        p.delete();
+        assertFalse(b.getRootDir().isDirectory());
+    }
+
 }
-- 
GitLab