Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
野花太放肆
jenkins
提交
c86aa679
J
jenkins
项目概览
野花太放肆
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,发现更多精彩内容 >>
提交
c86aa679
编写于
5月 18, 2012
作者:
K
Kohsuke Kawaguchi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Enabled concurrent build support for matrix projects
上级
039b359a
变更
26
隐藏空白更改
内联
并排
Showing
26 changed file
with
276 addition
and
15 deletion
+276
-15
changelog.html
changelog.html
+2
-0
core/src/main/java/hudson/matrix/MatrixConfiguration.java
core/src/main/java/hudson/matrix/MatrixConfiguration.java
+10
-0
core/src/main/java/hudson/model/AbstractProject.java
core/src/main/java/hudson/model/AbstractProject.java
+1
-1
core/src/main/java/jenkins/model/Jenkins.java
core/src/main/java/jenkins/model/Jenkins.java
+5
-0
core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly
...urces/hudson/matrix/MatrixProject/configure-entries.jelly
+1
-0
core/src/main/resources/hudson/model/AbstractItem/configure-common.jelly
...esources/hudson/model/AbstractItem/configure-common.jelly
+1
-3
core/src/main/resources/hudson/model/AbstractItem/configure-common.properties
...ces/hudson/model/AbstractItem/configure-common.properties
+0
-1
core/src/main/resources/hudson/model/AbstractItem/configure-common_da.properties
.../hudson/model/AbstractItem/configure-common_da.properties
+0
-1
core/src/main/resources/hudson/model/AbstractItem/configure-common_de.properties
.../hudson/model/AbstractItem/configure-common_de.properties
+0
-1
core/src/main/resources/hudson/model/AbstractItem/configure-common_es.properties
.../hudson/model/AbstractItem/configure-common_es.properties
+0
-1
core/src/main/resources/hudson/model/AbstractItem/configure-common_fr.properties
.../hudson/model/AbstractItem/configure-common_fr.properties
+0
-1
core/src/main/resources/hudson/model/AbstractItem/configure-common_it.properties
.../hudson/model/AbstractItem/configure-common_it.properties
+0
-1
core/src/main/resources/hudson/model/AbstractItem/configure-common_ja.properties
.../hudson/model/AbstractItem/configure-common_ja.properties
+0
-1
core/src/main/resources/hudson/model/AbstractItem/configure-common_pt_BR.properties
...dson/model/AbstractItem/configure-common_pt_BR.properties
+0
-2
core/src/main/resources/hudson/model/AbstractItem/configure-common_zh_CN.properties
...dson/model/AbstractItem/configure-common_zh_CN.properties
+0
-1
core/src/main/resources/lib/hudson/project/config-concurrentBuild.jelly
...resources/lib/hudson/project/config-concurrentBuild.jelly
+31
-0
core/src/main/resources/lib/hudson/project/config-concurrentBuild.properties
...rces/lib/hudson/project/config-concurrentBuild.properties
+23
-0
core/src/main/resources/lib/hudson/project/config-concurrentBuild_da.properties
...s/lib/hudson/project/config-concurrentBuild_da.properties
+23
-0
core/src/main/resources/lib/hudson/project/config-concurrentBuild_de.properties
...s/lib/hudson/project/config-concurrentBuild_de.properties
+23
-0
core/src/main/resources/lib/hudson/project/config-concurrentBuild_es.properties
...s/lib/hudson/project/config-concurrentBuild_es.properties
+23
-0
core/src/main/resources/lib/hudson/project/config-concurrentBuild_fr.properties
...s/lib/hudson/project/config-concurrentBuild_fr.properties
+23
-0
core/src/main/resources/lib/hudson/project/config-concurrentBuild_it.properties
...s/lib/hudson/project/config-concurrentBuild_it.properties
+23
-0
core/src/main/resources/lib/hudson/project/config-concurrentBuild_pt_BR.properties
...ib/hudson/project/config-concurrentBuild_pt_BR.properties
+23
-0
core/src/main/resources/lib/hudson/project/config-concurrentBuild_zh_CN.properties
...ib/hudson/project/config-concurrentBuild_zh_CN.properties
+23
-0
pom.xml
pom.xml
+1
-1
test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy
test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy
+40
-0
未找到文件。
changelog.html
浏览文件 @
c86aa679
...
...
@@ -57,6 +57,8 @@ Upcoming changes</a>
<ul
class=
image
>
<li
class=
rfe
>
Exposed plugin manager and update center to the REST API
<li
class=
rfe
>
Enabled concurrent build support for matrix projects
</ul>
</div>
<!--=TRUNK-END=-->
...
...
core/src/main/java/hudson/matrix/MatrixConfiguration.java
浏览文件 @
c86aa679
...
...
@@ -78,6 +78,16 @@ public class MatrixConfiguration extends Project<MatrixConfiguration,MatrixRun>
super
.
onLoad
(
parent
,
combination
.
toString
());
}
@Override
public
boolean
isConcurrentBuild
()
{
return
getParent
().
isConcurrentBuild
();
}
@Override
public
void
setConcurrentBuild
(
boolean
b
)
throws
IOException
{
throw
new
UnsupportedOperationException
(
"The setting can be only changed at MatrixProject"
);
}
/**
* Used during loading to set the combination back.
*/
...
...
core/src/main/java/hudson/model/AbstractProject.java
浏览文件 @
c86aa679
...
...
@@ -299,7 +299,7 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
*/
@Exported
public
boolean
isConcurrentBuild
()
{
return
Jenkins
.
CONCURRENT_BUILD
&&
concurrentBuild
;
return
concurrentBuild
;
}
public
void
setConcurrentBuild
(
boolean
b
)
throws
IOException
{
...
...
core/src/main/java/jenkins/model/Jenkins.java
浏览文件 @
c86aa679
...
...
@@ -213,6 +213,8 @@ import org.jvnet.hudson.reactor.TaskBuilder;
import
org.jvnet.hudson.reactor.TaskGraphBuilder
;
import
org.jvnet.hudson.reactor.Reactor
;
import
org.jvnet.hudson.reactor.TaskGraphBuilder.Handle
;
import
org.kohsuke.accmod.Restricted
;
import
org.kohsuke.accmod.restrictions.NoExternalUse
;
import
org.kohsuke.args4j.Argument
;
import
org.kohsuke.args4j.Option
;
import
org.kohsuke.stapler.Ancestor
;
...
...
@@ -3802,7 +3804,10 @@ public class Jenkins extends AbstractCIBase implements ModifiableItemGroup<TopLe
* When we merge this back to the trunk, this allows us to keep
* this feature hidden for a while until we iron out the kinks.
* @see AbstractProject#isConcurrentBuild()
* @deprecated as of 1.464
* This flag will have no effect.
*/
@Restricted
(
NoExternalUse
.
class
)
public
static
boolean
CONCURRENT_BUILD
=
true
;
/**
...
...
core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly
浏览文件 @
c86aa679
...
...
@@ -30,6 +30,7 @@ THE SOFTWARE.
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
<p:config-disableBuild/>
<p:config-concurrentBuild />
<f:section title="${%Advanced Project Options}">
<f:advanced>
...
...
core/src/main/resources/hudson/model/AbstractItem/configure-common.jelly
浏览文件 @
c86aa679
...
...
@@ -29,9 +29,7 @@ THE SOFTWARE.
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:p="/lib/hudson/project" xmlns:this="this">
<p:config-disableBuild/>
<j:if test="${app.CONCURRENT_BUILD}">
<f:optionalBlock field="concurrentBuild" title="${%title.concurrentbuilds}" />
</j:if>
<p:config-concurrentBuild />
<j:set var="jdks" value="${app.JDKs}" />
<j:if test="${jdks.size() gt 1}">
...
...
core/src/main/resources/hudson/model/AbstractItem/configure-common.properties
浏览文件 @
c86aa679
...
...
@@ -22,5 +22,4 @@
default.value
=
(Default)
Advanced\
Project\
Options\
configure-common
=
Advanced Project Options
title.concurrentbuilds
=
Execute concurrent builds if necessary
Display\
Name
=
Display Name
core/src/main/resources/hudson/model/AbstractItem/configure-common_da.properties
浏览文件 @
c86aa679
...
...
@@ -23,6 +23,5 @@
Label\
Expression
=
Etiketudtryk
default.value
=
(Standard)
Restrict\
where\
this\
project\
can\
be\
run
=
Begr
\u
00e6ns hvor dette projekt kan k
\u
00f8res
title.concurrentbuilds
=
K
\u
00f8r parallelle byg om n
\u
00f8dvendigt
Advanced\
Project\
Options\
configure-common
=
Avancerede projektindstillinger
JDK\
to\
be\
used\
for\
this\
project
=
JDK der skal benyttes til dette projekt
core/src/main/resources/hudson/model/AbstractItem/configure-common_de.properties
浏览文件 @
c86aa679
...
...
@@ -23,6 +23,5 @@
JDK\
to\
be\
used\
for\
this\
project
=
JDK, das für dieses Projekt verwendet wird
default.value
=
(Vorgabewert)
Advanced\
Project\
Options\
configure-common
=
Erweiterte Projekteinstellungen
title.concurrentbuilds
=
Parallele Builds ausführen, wenn notwendig
Restrict\
where\
this\
project\
can\
be\
run
=
Beschränke wo dieses Projekt ausgeführt werden darf
Label\
Expression
=
Label-Ausdruck
core/src/main/resources/hudson/model/AbstractItem/configure-common_es.properties
浏览文件 @
c86aa679
...
...
@@ -22,7 +22,6 @@
default.value
=
(por defecto)
Advanced\
Project\
Options\
configure-common
=
Opciones avanzadas del proyecto
title.concurrentbuilds
=
Lanzar ejecuciones concurrentes en caso de ser necesario
JDK\
to\
be\
used\
for\
this\
project
=
JDK que se debe usar para este proyecto
Label\
Expression
=
Expresión
Restrict\
where\
this\
project\
can\
be\
run
=
Restringir dónde se puede ejecutar este proyecto.
core/src/main/resources/hudson/model/AbstractItem/configure-common_fr.properties
浏览文件 @
c86aa679
...
...
@@ -26,4 +26,3 @@ Node=Noeud
Execute\
concurrent\
builds\
if\
necessary\
=Ex\u00E9cuter
les
builds
en
parall\u00E8le
si
n\u00E9cessaire
JDK\
to\
be\
used\
for\
this\
project
=
Le JDK à utiliser pour ce projet
default.value
=
(Valeur par défaut)
title.concurrentbuilds
=
Ex
\u
00E9cuter des builds simultan
\u
00E9ment si n
\u
00E9cessaire
core/src/main/resources/hudson/model/AbstractItem/configure-common_it.properties
浏览文件 @
c86aa679
...
...
@@ -21,4 +21,3 @@
# THE SOFTWARE.
Advanced\
Project\
Options\
configure-common
=
Opzioni avanzate del progetto
title.concurrentbuilds
=
Esegui build in concorrenza se necessario (beta)
core/src/main/resources/hudson/model/AbstractItem/configure-common_ja.properties
浏览文件 @
c86aa679
...
...
@@ -23,7 +23,6 @@
JDK\
to\
be\
used\
for\
this\
project
=
\u3053\u
306e
\u
30d7
\u
30ed
\u
30b8
\u
30a7
\u
30af
\u
30c8
\u3067\u
4f7f
\u7528\u3059\u
308bJDK
Advanced\
Project\
Options\
configure-common
=
\u
30d7
\u
30ed
\u
30b8
\u
30a7
\u
30af
\u
30c8
\u
306e
\u
9ad8
\u
5ea6
\u
306a
\u
30aa
\u
30d7
\u
30b7
\u
30e7
\u
30f3
default.value
=
\u
30c7
\u
30d5
\u
30a9
\u
30eb
\u
30c8
title.concurrentbuilds
=
\u
53ef
\u
80fd
\u3067\u3042\u
308c
\u3070\u
4e26
\u
884c
\u3057\u3066\u
30d3
\u
30eb
\u
30c9
Restrict\
where\
this\
project\
can\
be\
run
=
\u
5b9f
\u
884c
\u3059\u
308b
\u
30ce
\u
30fc
\u
30c9
\u3092\u5236\u9650
Label\
Expression
=
\u
30e9
\u
30d9
\u
30eb
\u
5f0f
Display\
Name
=
\u8868\u
793a
\u7528\u
30d7
\u
30ed
\u
30b8
\u
30a7
\u
30af
\u
30c8
\u
540d
core/src/main/resources/hudson/model/AbstractItem/configure-common_pt_BR.properties
浏览文件 @
c86aa679
...
...
@@ -24,7 +24,5 @@ Advanced\ Project\ Options\ configure-common=Op\u00e7\u00f5es Avan\u00e7adas do
# (Default)
default.value
=
Default
Node
=
N
\u
00f3
# Execute concurrent builds if necessary (beta)
title.concurrentbuilds
=
Execute as construcoes se necessario
Tie\
this\
project\
to\
a\
node
=
Vincular esse projeto a um N
\u
00f3
JDK\
to\
be\
used\
for\
this\
project
=
Necess
\u
00e1rio usar JDK nesse projeto
core/src/main/resources/hudson/model/AbstractItem/configure-common_zh_CN.properties
浏览文件 @
c86aa679
...
...
@@ -21,4 +21,3 @@
# THE SOFTWARE.
Advanced\
Project\
Options\
configure-common
=
\u
9AD8
\u
7EA7
\u9879\u
76EE
\u9009\u9879
title.concurrentbuilds
=
\u5728\u
5FC5
\u8981\u7684\u
65F6
\u5019\u
5E76
\u
53D1
\u6784\u
5EFA
core/src/main/resources/lib/hudson/project/config-concurrentBuild.jelly
0 → 100644
浏览文件 @
c86aa679
<!--
The MIT License
Copyright (c) 2012, CloudBees, Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->
<!--
Configuration entry for concurrent build
-->
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<f:optionalBlock field="concurrentBuild" title="${%title.concurrentbuilds}" />
</j:jelly>
\ No newline at end of file
core/src/main/resources/lib/hudson/project/config-concurrentBuild.properties
0 → 100644
浏览文件 @
c86aa679
# the mit license
#
# copyright (c) 2004-2012, sun microsystems, inc., kohsuke kawaguchi, eric lefevre-ardant
#
# permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "software"), to deal
# in the software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
title.concurrentbuilds
=
Execute concurrent builds if necessary
core/src/main/resources/lib/hudson/project/config-concurrentBuild_da.properties
0 → 100644
浏览文件 @
c86aa679
# The MIT License
#
# Copyright (c) 2004-2010, Sun Microsystems, Inc. Kohsuke Kawaguchi. Knud Poulsen.
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
title.concurrentbuilds
=
K
\u
00f8r parallelle byg om n
\u
00f8dvendigt
core/src/main/resources/lib/hudson/project/config-concurrentBuild_de.properties
0 → 100644
浏览文件 @
c86aa679
# The MIT License
#
# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Simon Wiest
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
title.concurrentbuilds
=
Parallele Builds ausf?hren, wenn notwendig
core/src/main/resources/lib/hudson/project/config-concurrentBuild_es.properties
0 → 100644
浏览文件 @
c86aa679
# The MIT License
#
# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Eric Lefevre-Ardant
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
title.concurrentbuilds
=
Lanzar ejecuciones concurrentes en caso de ser necesario
core/src/main/resources/lib/hudson/project/config-concurrentBuild_fr.properties
0 → 100644
浏览文件 @
c86aa679
# The MIT License
#
# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Eric Lefevre-Ardant
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
title.concurrentbuilds
=
Ex
\u
00E9cuter des builds simultan
\u
00E9ment si n
\u
00E9cessaire
core/src/main/resources/lib/hudson/project/config-concurrentBuild_it.properties
0 → 100644
浏览文件 @
c86aa679
# The MIT License
#
# Copyright (c) 2004-2010, Sun Microsystems, Inc.
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
title.concurrentbuilds
=
Esegui build in concorrenza se necessario (beta)
core/src/main/resources/lib/hudson/project/config-concurrentBuild_pt_BR.properties
0 → 100644
浏览文件 @
c86aa679
# The MIT License
#
# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Reginaldo L. Russinholi, Cleiber Silva
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
title.concurrentbuilds
=
Execute as construcoes se necessario
core/src/main/resources/lib/hudson/project/config-concurrentBuild_zh_CN.properties
0 → 100644
浏览文件 @
c86aa679
# The MIT License
#
# Copyright (c) 2004-2010, Sun Microsystems, Inc.
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
title.concurrentbuilds
=
\u5728\u
5FC5
\u8981\u7684\u
65F6
\u5019\u
5E76
\u
53D1
\u6784\u
5EFA
pom.xml
浏览文件 @
c86aa679
...
...
@@ -189,7 +189,7 @@ THE SOFTWARE.
<dependency>
<groupId>
org.jenkins-ci.main
</groupId>
<artifactId>
remoting
</artifactId>
<version>
2.1
4
</version>
<version>
2.1
3
</version>
</dependency>
<dependency>
...
...
test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy
浏览文件 @
c86aa679
...
...
@@ -53,6 +53,9 @@ import hudson.model.FileParameterDefinition
import
hudson.model.Cause.LegacyCodeCause
import
hudson.model.ParametersAction
import
hudson.model.FileParameterValue
import
org.jvnet.hudson.test.MockBuilder
import
org.jvnet.hudson.test.SleepBuilder
import
java.util.concurrent.CountDownLatch
/**
*
...
...
@@ -327,4 +330,41 @@ public class MatrixProjectTest extends HudsonTestCase {
assertBuildStatusSuccess
(
f
.
get
(
10
,
TimeUnit
.
SECONDS
));
}
/**
* Verifies that the concurrent build feature works, and makes sure
* that each gets its own unique workspace.
*/
void
testConcurrentBuild
()
{
jenkins
.
numExecutors
=
10
jenkins
.
updateComputerList
()
def
p
=
createMatrixProject
()
p
.
axes
=
new
AxisList
(
new
TextAxis
(
"foo"
,
"1"
,
"2"
))
p
.
concurrentBuild
=
true
;
def
latch
=
new
CountDownLatch
(
4
)
def
dirs
=
Collections
.
synchronizedSet
(
new
HashSet
())
p
.
buildersList
.
add
(
new
TestBuilder
()
{
boolean
perform
(
AbstractBuild
<?,
?>
build
,
Launcher
launcher
,
BuildListener
listener
)
{
dirs
<<
build
.
workspace
.
getRemote
()
def
marker
=
build
.
workspace
.
child
(
"file"
)
def
name
=
build
.
fullDisplayName
marker
.
write
(
name
,
"UTF-8"
)
latch
.
countDown
()
latch
.
await
()
assertEquals
(
name
,
marker
.
readToString
())
return
true
}
})
// should have gotten all unique names
def
f1
=
p
.
scheduleBuild2
(
0
)
// get one going
Thread
.
sleep
(
1000
)
def
f2
=
p
.
scheduleBuild2
(
0
)
[
f1
,
f2
]*.
get
().
each
{
assertBuildStatusSuccess
(
it
)}
assertEquals
4
,
dirs
.
size
()
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录