Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
c9d69d36
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,发现更多精彩内容 >>
提交
c9d69d36
编写于
1月 27, 2014
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIXED JENKINS-21525] Make command to run an external job work with folders.
上级
18646cb9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
9 addition
and
8 deletion
+9
-8
changelog.html
changelog.html
+3
-1
core/src/main/java/hudson/Main.java
core/src/main/java/hudson/Main.java
+6
-7
未找到文件。
changelog.html
浏览文件 @
c9d69d36
...
...
@@ -55,7 +55,9 @@ Upcoming changes</a>
<!-- Record your changes in the trunk here. -->
<div
id=
"trunk"
style=
"display:none"
>
<!--=TRUNK-BEGIN=-->
<ul
class=
image
>
<li
class=
>
<li
class=
bug
>
Using
<code>
java -jar jenkins-core.jar folder/external-monitor-job cmd …
</code>
did not work.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-21525"
>
issue 21525
</a>
)
</ul>
</div>
<!--=TRUNK-END=-->
...
...
core/src/main/java/hudson/Main.java
浏览文件 @
c9d69d36
...
...
@@ -37,7 +37,6 @@ import java.io.Writer;
import
java.net.HttpRetryException
;
import
java.net.HttpURLConnection
;
import
java.net.URL
;
import
java.net.URLEncoder
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.nio.charset.Charset
;
...
...
@@ -104,14 +103,14 @@ public class Main {
}
}
String
projectNameEnc
=
URLEncoder
.
encode
(
projectName
,
"UTF-8"
).
replaceAll
(
"\\+"
,
"%20
"
);
URL
jobURL
=
new
URL
(
home
+
"job/"
+
Util
.
encode
(
projectName
).
replace
(
"/"
,
"/job/"
)
+
"/
"
);
{
// check if the job name is correct
HttpURLConnection
con
=
open
(
new
URL
(
home
+
"job/"
+
projectNameEnc
+
"/
acceptBuildResult"
));
HttpURLConnection
con
=
open
(
new
URL
(
jobURL
,
"
acceptBuildResult"
));
if
(
auth
!=
null
)
con
.
setRequestProperty
(
"Authorization"
,
auth
);
con
.
connect
();
if
(
con
.
getResponseCode
()!=
200
)
{
System
.
err
.
println
(
projectName
+
" is not a valid job name on "
+
home
+
" ("
+
con
.
getResponseMessage
()+
")"
);
System
.
err
.
println
(
jobURL
+
" is not a valid external job ("
+
con
.
getResponseCode
()
+
" "
+
con
.
getResponseMessage
()
+
")"
);
return
-
1
;
}
}
...
...
@@ -156,11 +155,11 @@ public class Main {
w
.
write
(
"</log><result>"
+
ret
+
"</result><duration>"
+(
System
.
currentTimeMillis
()-
start
)+
"</duration></run>"
);
w
.
close
();
String
location
=
home
+
"job/"
+
projectNameEnc
+
"/postBuildResult"
;
URL
location
=
new
URL
(
jobURL
,
"postBuildResult"
)
;
while
(
true
)
{
try
{
// start a remote connection
HttpURLConnection
con
=
open
(
new
URL
(
location
)
);
HttpURLConnection
con
=
open
(
location
);
if
(
auth
!=
null
)
con
.
setRequestProperty
(
"Authorization"
,
auth
);
if
(
crumbField
!=
null
&&
crumbValue
!=
null
)
{
con
.
setRequestProperty
(
crumbField
,
crumbValue
);
...
...
@@ -182,7 +181,7 @@ public class Main {
}
catch
(
HttpRetryException
e
)
{
if
(
e
.
getLocation
()!=
null
)
{
// retry with the new location
location
=
e
.
getLocation
(
);
location
=
new
URL
(
e
.
getLocation
()
);
continue
;
}
// otherwise failed for reasons beyond us.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录