Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
9d3fc6d9
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,发现更多精彩内容 >>
提交
9d3fc6d9
编写于
12月 23, 2011
作者:
S
Seiji Sogabe
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #334 from fredg02/Hyperlinks
Added hyperlinks to console output
上级
8bfbd436
c5bee090
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
23 addition
and
8 deletion
+23
-8
core/src/main/java/hudson/matrix/MatrixBuild.java
core/src/main/java/hudson/matrix/MatrixBuild.java
+7
-6
core/src/main/java/hudson/model/AbstractBuild.java
core/src/main/java/hudson/model/AbstractBuild.java
+4
-2
core/src/main/java/hudson/model/Cause.java
core/src/main/java/hudson/model/Cause.java
+6
-0
core/src/main/resources/hudson/matrix/Messages_de.properties
core/src/main/resources/hudson/matrix/Messages_de.properties
+6
-0
未找到文件。
core/src/main/java/hudson/matrix/MatrixBuild.java
浏览文件 @
9d3fc6d9
...
...
@@ -25,6 +25,7 @@
package
hudson.matrix
;
import
hudson.Util
;
import
hudson.console.HyperlinkNote
;
import
hudson.matrix.listeners.MatrixBuildListener
;
import
hudson.model.AbstractBuild
;
import
hudson.model.AbstractProject
;
...
...
@@ -292,7 +293,7 @@ public class MatrixBuild extends AbstractBuild<MatrixProject,MatrixBuild> {
if
(
p
.
isRunSequentially
())
scheduleConfigurationBuild
(
logger
,
c
);
Result
buildResult
=
waitForCompletion
(
listener
,
c
);
logger
.
println
(
Messages
.
MatrixBuild_Completed
(
c
.
getDisplayName
(
),
buildResult
));
logger
.
println
(
Messages
.
MatrixBuild_Completed
(
HyperlinkNote
.
encodeTo
(
'/'
+
c
.
getUrl
(),
c
.
getDisplayName
()
),
buildResult
));
r
=
r
.
combine
(
buildResult
);
}
...
...
@@ -311,12 +312,12 @@ public class MatrixBuild extends AbstractBuild<MatrixProject,MatrixBuild> {
synchronized
(
q
)
{
// avoid micro-locking in q.cancel.
for
(
MatrixConfiguration
c
:
activeConfigurations
)
{
if
(
q
.
cancel
(
c
))
logger
.
println
(
Messages
.
MatrixBuild_Cancelled
(
c
.
getDisplayName
(
)));
logger
.
println
(
Messages
.
MatrixBuild_Cancelled
(
HyperlinkNote
.
encodeTo
(
'/'
+
c
.
getUrl
(),
c
.
getDisplayName
()
)));
MatrixRun
b
=
c
.
getBuildByNumber
(
n
);
if
(
b
!=
null
)
{
Executor
exe
=
b
.
getExecutor
();
if
(
exe
!=
null
)
{
logger
.
println
(
Messages
.
MatrixBuild_Interrupting
(
b
.
getDisplayName
(
)));
logger
.
println
(
Messages
.
MatrixBuild_Interrupting
(
HyperlinkNote
.
encodeTo
(
'/'
+
b
.
getUrl
(),
b
.
getDisplayName
()
)));
exe
.
interrupt
();
}
}
...
...
@@ -364,7 +365,7 @@ public class MatrixBuild extends AbstractBuild<MatrixProject,MatrixBuild> {
// http://www.nabble.com/Anyone-using-AccuRev-plugin--tt21634577.html#a21671389
// because of this, we really make sure that the build is cancelled by doing this 5
// times over 5 seconds
listener
.
getLogger
().
println
(
Messages
.
MatrixBuild_AppearsCancelled
(
c
.
getDisplayName
(
)));
listener
.
getLogger
().
println
(
Messages
.
MatrixBuild_AppearsCancelled
(
HyperlinkNote
.
encodeTo
(
'/'
+
c
.
getUrl
(),
c
.
getDisplayName
()
)));
buildResult
=
Result
.
ABORTED
;
}
...
...
@@ -379,7 +380,7 @@ public class MatrixBuild extends AbstractBuild<MatrixProject,MatrixBuild> {
// if the build seems to be stuck in the queue, display why
String
why
=
qi
.
getWhy
();
if
(!
why
.
equals
(
whyInQueue
)
&&
System
.
currentTimeMillis
()-
startTime
>
5000
)
{
listener
.
getLogger
().
println
(
c
.
getDisplayName
(
)+
" is still in the queue: "
+
why
);
listener
.
getLogger
().
println
(
HyperlinkNote
.
encodeTo
(
'/'
+
c
.
getUrl
(),
c
.
getDisplayName
()
)+
" is still in the queue: "
+
why
);
whyInQueue
=
why
;
}
}
...
...
@@ -389,7 +390,7 @@ public class MatrixBuild extends AbstractBuild<MatrixProject,MatrixBuild> {
}
private
void
scheduleConfigurationBuild
(
PrintStream
logger
,
MatrixConfiguration
c
)
{
logger
.
println
(
Messages
.
MatrixBuild_Triggering
(
c
.
getDisplayName
(
)));
logger
.
println
(
Messages
.
MatrixBuild_Triggering
(
HyperlinkNote
.
encodeTo
(
'/'
+
c
.
getUrl
(),
c
.
getDisplayName
()
)));
c
.
scheduleBuild
(
getAction
(
ParametersAction
.
class
),
new
UpstreamCause
(
MatrixBuild
.
this
));
}
...
...
core/src/main/java/hudson/model/AbstractBuild.java
浏览文件 @
9d3fc6d9
...
...
@@ -31,6 +31,7 @@ import hudson.Launcher;
import
hudson.Util
;
import
hudson.FilePath
;
import
hudson.console.AnnotatedLargeText
;
import
hudson.console.HyperlinkNote
;
import
hudson.console.ExpandableDetailsNote
;
import
hudson.model.listeners.RunListener
;
import
hudson.slaves.WorkspaceList
;
...
...
@@ -445,8 +446,9 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
launcher
=
createLauncher
(
listener
);
if
(!
Jenkins
.
getInstance
().
getNodes
().
isEmpty
())
listener
.
getLogger
().
println
(
node
instanceof
Jenkins
?
Messages
.
AbstractBuild_BuildingOnMaster
()
:
Messages
.
AbstractBuild_BuildingRemotely
(
builtOn
));
listener
.
getLogger
().
println
(
node
instanceof
Jenkins
?
Messages
.
AbstractBuild_BuildingOnMaster
()
:
Messages
.
AbstractBuild_BuildingRemotely
(
HyperlinkNote
.
encodeTo
(
"/computer/"
+
builtOn
,
builtOn
)));
final
Lease
lease
=
decideWorkspace
(
node
,
Computer
.
currentComputer
().
getWorkspaceList
());
try
{
...
...
core/src/main/java/hudson/model/Cause.java
浏览文件 @
9d3fc6d9
...
...
@@ -250,6 +250,12 @@ public abstract class Cause {
return
Messages
.
Cause_UserIdCause_ShortDescription
(
getUserName
());
}
@Override
public
void
print
(
TaskListener
listener
)
{
listener
.
getLogger
().
println
(
Messages
.
Cause_UserIdCause_ShortDescription
(
HyperlinkNote
.
encodeTo
(
"/user/"
+
getUserName
(),
getUserName
())));
}
@Override
public
boolean
equals
(
Object
o
)
{
return
o
instanceof
UserIdCause
&&
Arrays
.
equals
(
new
Object
[]{
userId
},
...
...
core/src/main/resources/hudson/matrix/Messages_de.properties
浏览文件 @
9d3fc6d9
...
...
@@ -27,7 +27,13 @@ MatrixBuild.Triggering=L
MatrixBuild.AppearsCancelled
=
{0} scheint abgebrochen worden zu sein
MatrixBuild.Cancelled
=
{0} abgebrochen
MatrixBuild.Interrupting
=
Unterbreche {0}
MatrixBuild.Completed
=
{0} beendet mit Ergebnis {1}
MatrixConfiguration.Pronoun
=
Einstellungen
MatrixRun.KeptBecauseOfParent
=
Zurückbehalten, weil {0} zurückbehalten wurde.
LabelExpAxis.DisplayName
=
Labelausdruck
TextArea.DisplayName
=
Benutzerdefinierte Achse
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录