Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
b90b2022
J
jenkins
项目概览
LinuxSuRen
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b90b2022
编写于
3月 08, 2013
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIXED JENKINS-17137] Bogus permalinks created when using external builds directory.
上级
915d8253
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
36 addition
and
2 deletion
+36
-2
changelog.html
changelog.html
+3
-0
core/src/main/java/hudson/model/AbstractBuild.java
core/src/main/java/hudson/model/AbstractBuild.java
+8
-2
test/src/test/java/hudson/model/AbstractProjectTest.java
test/src/test/java/hudson/model/AbstractProjectTest.java
+25
-0
未找到文件。
changelog.html
浏览文件 @
b90b2022
...
...
@@ -64,6 +64,9 @@ Upcoming changes</a>
<li
class=
bug
>
Preview function for textareas using Jenkins markup did not work when CSRF protection was enabled.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-17085"
>
issue 17085
</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
>
JNA-related error from Windows slave monitoring thrown repeatedly.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-15796"
>
issue 15796
</a>
)
...
...
core/src/main/java/hudson/model/AbstractBuild.java
浏览文件 @
b90b2022
...
...
@@ -494,11 +494,17 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
if
(
newTarget
!=
null
)
newTarget
.
createSymlink
(
new
LogTaskListener
(
LOGGER
,
Level
.
WARNING
),
name
);
else
new
File
(
getProject
().
get
BuildDir
(),
"../"
+
name
).
delete
();
new
File
(
getProject
().
get
RootDir
(),
name
).
delete
();
}
private
void
createSymlink
(
TaskListener
listener
,
String
name
)
throws
InterruptedException
{
Util
.
createSymlink
(
getProject
().
getBuildDir
(),
"builds/"
+
getId
(),
"../"
+
name
,
listener
);
String
target
;
if
(
getProject
().
getBuildDir
().
equals
(
new
File
(
getProject
().
getRootDir
(),
"builds"
)))
{
target
=
"builds/"
+
getId
();
}
else
{
target
=
getRootDir
().
getAbsolutePath
();
}
Util
.
createSymlink
(
getProject
().
getRootDir
(),
target
,
name
,
listener
);
}
/**
...
...
test/src/test/java/hudson/model/AbstractProjectTest.java
浏览文件 @
b90b2022
...
...
@@ -58,6 +58,7 @@ import java.util.concurrent.Future;
import
org.apache.commons.io.FileUtils
;
import
java.lang.ref.WeakReference
;
import
java.net.HttpURLConnection
;
import
org.jvnet.hudson.test.MockFolder
;
/**
* @author Kohsuke Kawaguchi
...
...
@@ -329,4 +330,28 @@ public class AbstractProjectTest extends HudsonTestCase {
assertEquals
(
1
,
u
.
getPublishersList
().
size
());
}
@Bug
(
17137
)
public
void
testExternalBuildDirectorySymlinks
()
throws
Exception
{
// XXX when using JUnit 4 add: Assume.assumeFalse(Functions.isWindows()); // symlinks may not be available
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
,
"p"
);
FreeStyleBuild
b1
=
p
.
scheduleBuild2
(
0
).
get
();
File
link
=
new
File
(
p
.
getRootDir
(),
"lastStable"
);
assertTrue
(
link
.
exists
());
assertEquals
(
b1
.
getRootDir
().
getAbsolutePath
(),
Util
.
resolveSymlink
(
link
));
FreeStyleBuild
b2
=
p
.
scheduleBuild2
(
0
).
get
();
assertTrue
(
link
.
exists
());
assertEquals
(
b2
.
getRootDir
().
getAbsolutePath
(),
Util
.
resolveSymlink
(
link
));
b2
.
delete
();
assertTrue
(
link
.
exists
());
assertEquals
(
b1
.
getRootDir
().
getAbsolutePath
(),
Util
.
resolveSymlink
(
link
));
b1
.
delete
();
assertFalse
(
link
.
exists
());
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录