Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
d3096819
J
jenkins
项目概览
xxadev
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
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,发现更多精彩内容 >>
提交
d3096819
编写于
3月 10, 2013
作者:
P
Pedro Rodriguez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[JENKINS-10502] Option to make the build NOT fail if there is nothing to archive
上级
70f81b51
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
20 addition
and
9 deletion
+20
-9
core/src/main/java/hudson/tasks/ArtifactArchiver.java
core/src/main/java/hudson/tasks/ArtifactArchiver.java
+11
-4
core/src/main/resources/hudson/tasks/ArtifactArchiver/config.jelly
...main/resources/hudson/tasks/ArtifactArchiver/config.jelly
+3
-0
core/src/main/resources/hudson/tasks/ArtifactArchiver/config.properties
...resources/hudson/tasks/ArtifactArchiver/config.properties
+1
-0
test/src/test/java/hudson/model/AbstractProjectTest.java
test/src/test/java/hudson/model/AbstractProjectTest.java
+1
-1
test/src/test/java/hudson/tasks/ArtifactArchiverTest.java
test/src/test/java/hudson/tasks/ArtifactArchiverTest.java
+3
-3
test/src/test/java/hudson/tasks/LogRotatorTest.java
test/src/test/java/hudson/tasks/LogRotatorTest.java
+1
-1
未找到文件。
core/src/main/java/hudson/tasks/ArtifactArchiver.java
浏览文件 @
d3096819
...
...
@@ -63,15 +63,18 @@ public class ArtifactArchiver extends Recorder {
* Just keep the last successful artifact set, no more.
*/
private
final
boolean
latestOnly
;
private
static
final
Boolean
allowEmptyArchive
=
Boolean
.
getBoolean
(
ArtifactArchiver
.
class
.
getName
()+
".warnOnEmpty"
);
/**
* Fail (or not) the build if archiving returns nothing.
*/
private
final
boolean
allowEmptyArchive
;
@DataBoundConstructor
public
ArtifactArchiver
(
String
artifacts
,
String
excludes
,
boolean
latestOnly
)
{
public
ArtifactArchiver
(
String
artifacts
,
String
excludes
,
boolean
latestOnly
,
boolean
allowEmptyArchive
)
{
this
.
artifacts
=
artifacts
.
trim
();
this
.
excludes
=
Util
.
fixEmptyAndTrim
(
excludes
);
this
.
latestOnly
=
latestOnly
;
this
.
allowEmptyArchive
=
allowEmptyArchive
;
}
public
String
getArtifacts
()
{
...
...
@@ -85,6 +88,10 @@ public class ArtifactArchiver extends Recorder {
public
boolean
isLatestOnly
()
{
return
latestOnly
;
}
public
boolean
getAllowEmptyArchive
()
{
return
allowEmptyArchive
;
}
private
void
listenerWarnOrError
(
BuildListener
listener
,
String
message
)
{
if
(
allowEmptyArchive
)
{
...
...
core/src/main/resources/hudson/tasks/ArtifactArchiver/config.jelly
浏览文件 @
d3096819
...
...
@@ -34,5 +34,8 @@ THE SOFTWARE.
<f:entry title="" field="latestOnly" >
<f:checkbox title="${%lastBuildOnly}"/>
</f:entry>
<f:entry title="" field="allowEmptyArchive" >
<f:checkbox title="${%allowEmptyArchive}"/>
</f:entry>
</f:advanced>
</j:jelly>
\ No newline at end of file
core/src/main/resources/hudson/tasks/ArtifactArchiver/config.properties
浏览文件 @
d3096819
...
...
@@ -21,3 +21,4 @@
# THE SOFTWARE.
lastBuildOnly
=
Discard all but the last successful/stable artifact to save disk space
allowEmptyArchive
=
Do not fail build if archiving returns nothing
\ No newline at end of file
test/src/test/java/hudson/model/AbstractProjectTest.java
浏览文件 @
d3096819
...
...
@@ -280,7 +280,7 @@ public class AbstractProjectTest extends HudsonTestCase {
assertSymlinkForBuild
(
lastSuccessful
,
1
);
assertSymlinkForBuild
(
lastStable
,
1
);
// Archive artifacts that don't exist to create failure in post-build action
job
.
getPublishersList
().
add
(
new
ArtifactArchiver
(
"*.foo"
,
""
,
false
));
job
.
getPublishersList
().
add
(
new
ArtifactArchiver
(
"*.foo"
,
""
,
false
,
false
));
build
=
job
.
scheduleBuild2
(
0
,
new
Cause
.
UserCause
()).
get
();
assertEquals
(
Result
.
FAILURE
,
build
.
getResult
());
// Links should not be updated since build failed
...
...
test/src/test/java/hudson/tasks/ArtifactArchiverTest.java
浏览文件 @
d3096819
...
...
@@ -48,7 +48,7 @@ public class ArtifactArchiverTest extends HudsonTestCase {
public
void
testSuccessVsFailure
()
throws
Exception
{
FreeStyleProject
project
=
createFreeStyleProject
();
project
.
getPublishersList
().
replaceBy
(
Collections
.
singleton
(
new
ArtifactArchiver
(
"f"
,
""
,
true
)));
project
.
getPublishersList
().
replaceBy
(
Collections
.
singleton
(
new
ArtifactArchiver
(
"f"
,
""
,
true
,
false
)));
assertEquals
(
"(no artifacts)"
,
Result
.
FAILURE
,
build
(
project
));
// #1
assertFalse
(
project
.
getBuildByNumber
(
1
).
getHasArtifacts
());
project
.
getBuildersList
().
replaceBy
(
Collections
.
singleton
(
new
CreateArtifact
()));
...
...
@@ -86,7 +86,7 @@ public class ArtifactArchiverTest extends HudsonTestCase {
@Bug
(
2417
)
public
void
testStableVsUnstable
()
throws
Exception
{
FreeStyleProject
project
=
createFreeStyleProject
();
Publisher
artifactArchiver
=
new
ArtifactArchiver
(
"f"
,
""
,
true
);
Publisher
artifactArchiver
=
new
ArtifactArchiver
(
"f"
,
""
,
true
,
false
);
project
.
getPublishersList
().
replaceBy
(
Collections
.
singleton
(
artifactArchiver
));
project
.
getBuildersList
().
replaceBy
(
Collections
.
singleton
(
new
CreateArtifact
()));
assertEquals
(
Result
.
SUCCESS
,
build
(
project
));
// #1
...
...
@@ -123,7 +123,7 @@ public class ArtifactArchiverTest extends HudsonTestCase {
@Bug
(
3227
)
public
void
testEmptyDirectories
()
throws
Exception
{
FreeStyleProject
project
=
createFreeStyleProject
();
Publisher
artifactArchiver
=
new
ArtifactArchiver
(
"dir/"
,
""
,
false
);
Publisher
artifactArchiver
=
new
ArtifactArchiver
(
"dir/"
,
""
,
false
,
false
);
project
.
getPublishersList
().
replaceBy
(
Collections
.
singleton
(
artifactArchiver
));
project
.
getBuildersList
().
replaceBy
(
Collections
.
singleton
(
new
TestBuilder
()
{
public
boolean
perform
(
AbstractBuild
<?,
?>
build
,
Launcher
launcher
,
BuildListener
listener
)
throws
InterruptedException
,
IOException
{
...
...
test/src/test/java/hudson/tasks/LogRotatorTest.java
浏览文件 @
d3096819
...
...
@@ -79,7 +79,7 @@ public class LogRotatorTest extends HudsonTestCase {
public
void
testArtifactDelete
()
throws
Exception
{
FreeStyleProject
project
=
createFreeStyleProject
();
project
.
setLogRotator
(
new
LogRotator
(-
1
,
6
,
-
1
,
2
));
project
.
getPublishersList
().
replaceBy
(
Collections
.
singleton
(
new
ArtifactArchiver
(
"f"
,
""
,
true
)));
project
.
getPublishersList
().
replaceBy
(
Collections
.
singleton
(
new
ArtifactArchiver
(
"f"
,
""
,
true
,
false
)));
assertEquals
(
"(no artifacts)"
,
Result
.
FAILURE
,
build
(
project
));
// #1
assertFalse
(
project
.
getBuildByNumber
(
1
).
getHasArtifacts
());
project
.
getBuildersList
().
replaceBy
(
Collections
.
singleton
(
new
CreateArtifact
()));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录