Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
65d1fe5b
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,发现更多精彩内容 >>
提交
65d1fe5b
编写于
9月 14, 2015
作者:
V
Valentina Armenise
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[JENKINS-30084] some more polish
上级
eb52333d
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
6 addition
and
3 deletion
+6
-3
core/src/main/java/hudson/model/Queue.java
core/src/main/java/hudson/model/Queue.java
+5
-3
test/src/test/java/hudson/model/QueueTest.java
test/src/test/java/hudson/model/QueueTest.java
+1
-0
未找到文件。
core/src/main/java/hudson/model/Queue.java
浏览文件 @
65d1fe5b
...
@@ -1500,8 +1500,9 @@ public class Queue extends ResourceController implements Saveable {
...
@@ -1500,8 +1500,9 @@ public class Queue extends ResourceController implements Saveable {
m
.
execute
(
wuc
);
m
.
execute
(
wuc
);
p
.
leave
(
this
);
p
.
leave
(
this
);
if
(!
wuc
.
getWorkUnits
().
isEmpty
())
if
(!
wuc
.
getWorkUnits
().
isEmpty
())
{
makePending
(
p
);
makePending
(
p
);
}
else
else
LOGGER
.
log
(
Level
.
FINE
,
"BuildableItem {0} with empty work units!?"
,
p
);
LOGGER
.
log
(
Level
.
FINE
,
"BuildableItem {0} with empty work units!?"
,
p
);
...
@@ -1557,6 +1558,7 @@ public class Queue extends ResourceController implements Saveable {
...
@@ -1557,6 +1558,7 @@ public class Queue extends ResourceController implements Saveable {
* @param p - the flyweight task to be scheduled
* @param p - the flyweight task to be scheduled
* @return a Runnable if there is an executor that can take the task, null otherwise
* @return a Runnable if there is an executor that can take the task, null otherwise
*/
*/
@CheckForNull
private
Runnable
makeFlyWeightTaskBuildable
(
final
BuildableItem
p
){
private
Runnable
makeFlyWeightTaskBuildable
(
final
BuildableItem
p
){
//we double check if this is a flyweight task
//we double check if this is a flyweight task
if
(
p
.
task
instanceof
FlyweightTask
)
{
if
(
p
.
task
instanceof
FlyweightTask
)
{
...
@@ -1575,10 +1577,10 @@ public class Queue extends ResourceController implements Saveable {
...
@@ -1575,10 +1577,10 @@ public class Queue extends ResourceController implements Saveable {
for
(
Node
n
:
hash
.
list
(
p
.
task
.
getFullDisplayName
()))
{
for
(
Node
n
:
hash
.
list
(
p
.
task
.
getFullDisplayName
()))
{
final
Computer
c
=
n
.
toComputer
();
final
Computer
c
=
n
.
toComputer
();
if
(
n
.
canTake
(
p
)
!=
null
)
{
if
(
c
==
null
||
c
.
isOffline
()
)
{
continue
;
continue
;
}
}
if
(
c
==
null
||
c
.
isOffline
()
)
{
if
(
n
.
canTake
(
p
)
!=
null
)
{
continue
;
continue
;
}
}
return
new
Runnable
()
{
return
new
Runnable
()
{
...
...
test/src/test/java/hudson/model/QueueTest.java
浏览文件 @
65d1fe5b
...
@@ -800,6 +800,7 @@ public class QueueTest {
...
@@ -800,6 +800,7 @@ public class QueueTest {
r
.
jenkins
.
clouds
.
add
(
dummyCloud
);
r
.
jenkins
.
clouds
.
add
(
dummyCloud
);
project
.
setAssignedLabel
(
label
);
project
.
setAssignedLabel
(
label
);
r
.
assertBuildStatusSuccess
(
project
.
scheduleBuild2
(
0
));
r
.
assertBuildStatusSuccess
(
project
.
scheduleBuild2
(
0
));
assertEquals
(
"aws-linux-dummy"
,
project
.
getBuilds
().
getLastBuild
().
getBuiltOn
().
getLabelString
());
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录