Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
589d74a5
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,发现更多精彩内容 >>
提交
589d74a5
编写于
12月 15, 2014
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Making reverse migration tool handle more kinds of item groups.
上级
0a9b6382
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
10 deletion
+16
-10
core/src/main/java/jenkins/model/RunIdMigrator.java
core/src/main/java/jenkins/model/RunIdMigrator.java
+14
-8
core/src/test/java/jenkins/model/RunIdMigratorTest.java
core/src/test/java/jenkins/model/RunIdMigratorTest.java
+2
-2
未找到文件。
core/src/main/java/jenkins/model/RunIdMigrator.java
浏览文件 @
589d74a5
...
@@ -293,15 +293,21 @@ public final class RunIdMigrator {
...
@@ -293,15 +293,21 @@ public final class RunIdMigrator {
unmigrateJobsDir
(
jobs
);
unmigrateJobsDir
(
jobs
);
}
}
private
static
void
unmigrateJobsDir
(
File
jobs
)
throws
Exception
{
private
static
void
unmigrateJobsDir
(
File
jobs
)
throws
Exception
{
System
.
err
.
println
(
jobs
+
" will be inspected for build directories to restore"
);
for
(
File
job
:
jobs
.
listFiles
())
{
for
(
File
kid
:
jobs
.
listFiles
())
{
File
[]
kids
=
job
.
listFiles
();
File
builds
=
new
File
(
kid
,
"builds"
);
if
(
kids
==
null
)
{
if
(
builds
.
isDirectory
())
{
// kid is a job
continue
;
unmigrateBuildsDir
(
builds
);
}
}
File
jobs2
=
new
File
(
kid
,
"jobs"
);
for
(
File
kid
:
kids
)
{
if
(
jobs2
.
isDirectory
())
{
// kid is a folder
if
(!
kid
.
isDirectory
())
{
unmigrateJobsDir
(
jobs2
);
continue
;
}
if
(
kid
.
getName
().
equals
(
"builds"
))
{
unmigrateBuildsDir
(
kid
);
}
else
{
// Might be jobs, modules, promotions, etc.; we assume an ItemGroup.getRootDirFor implementation returns grandchildren.
unmigrateJobsDir
(
kid
);
}
}
}
}
}
}
}
...
...
core/src/test/java/jenkins/model/RunIdMigratorTest.java
浏览文件 @
589d74a5
...
@@ -96,7 +96,7 @@ public class RunIdMigratorTest {
...
@@ -96,7 +96,7 @@ public class RunIdMigratorTest {
@Test
public
void
reverseImmediately
()
throws
Exception
{
@Test
public
void
reverseImmediately
()
throws
Exception
{
File
root
=
dir
;
File
root
=
dir
;
dir
=
new
File
(
dir
,
"jobs/somefolder/jobs/someproject/builds"
);
dir
=
new
File
(
dir
,
"jobs/somefolder/jobs/someproject/
promotions/OK/
builds"
);
write
(
"99/build.xml"
,
"<?xml version='1.0' encoding='UTF-8'?>\n<run>\n <stuff>ok</stuff>\n <id>2014-01-02_03-04-05</id>\n <timestamp>1388649845000</timestamp>\n <otherstuff>ok</otherstuff>\n</run>"
);
write
(
"99/build.xml"
,
"<?xml version='1.0' encoding='UTF-8'?>\n<run>\n <stuff>ok</stuff>\n <id>2014-01-02_03-04-05</id>\n <timestamp>1388649845000</timestamp>\n <otherstuff>ok</otherstuff>\n</run>"
);
link
(
"lastFailedBuild"
,
"-1"
);
link
(
"lastFailedBuild"
,
"-1"
);
link
(
"lastSuccessfulBuild"
,
"99"
);
link
(
"lastSuccessfulBuild"
,
"99"
);
...
@@ -108,7 +108,7 @@ public class RunIdMigratorTest {
...
@@ -108,7 +108,7 @@ public class RunIdMigratorTest {
@Test
public
void
reverseAfterNewBuilds
()
throws
Exception
{
@Test
public
void
reverseAfterNewBuilds
()
throws
Exception
{
File
root
=
dir
;
File
root
=
dir
;
dir
=
new
File
(
dir
,
"jobs/someproject/builds"
);
dir
=
new
File
(
dir
,
"jobs/someproject/
modules/test$test/
builds"
);
write
(
"1/build.xml"
,
"<?xml version='1.0' encoding='UTF-8'?>\n<run>\n <stuff>ok</stuff>\n <timestamp>1388649845000</timestamp>\n <otherstuff>ok</otherstuff>\n</run>"
);
write
(
"1/build.xml"
,
"<?xml version='1.0' encoding='UTF-8'?>\n<run>\n <stuff>ok</stuff>\n <timestamp>1388649845000</timestamp>\n <otherstuff>ok</otherstuff>\n</run>"
);
write
(
"legacyIds"
,
""
);
write
(
"legacyIds"
,
""
);
assertEquals
(
"{1={build.xml='<?xml version='1.0' encoding='UTF-8'?>\n<run>\n <stuff>ok</stuff>\n <timestamp>1388649845000</timestamp>\n <otherstuff>ok</otherstuff>\n</run>'}, legacyIds=''}"
,
summarize
());
assertEquals
(
"{1={build.xml='<?xml version='1.0' encoding='UTF-8'?>\n<run>\n <stuff>ok</stuff>\n <timestamp>1388649845000</timestamp>\n <otherstuff>ok</otherstuff>\n</run>'}, legacyIds=''}"
,
summarize
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录