Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
516a405e
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
516a405e
编写于
4月 06, 2017
作者:
B
Bob Van Landuyt
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Take the ref of a pipeline into account when caching status
上级
02072e17
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
29 addition
and
17 deletion
+29
-17
lib/gitlab/cache/ci/project_pipeline_status.rb
lib/gitlab/cache/ci/project_pipeline_status.rb
+18
-9
spec/lib/gitlab/cache/ci/project_pipeline_status_spec.rb
spec/lib/gitlab/cache/ci/project_pipeline_status_spec.rb
+11
-8
未找到文件。
lib/gitlab/cache/ci/project_pipeline_status.rb
浏览文件 @
516a405e
...
...
@@ -5,7 +5,7 @@ module Gitlab
module
Cache
module
Ci
class
ProjectPipelineStatus
attr_accessor
:sha
,
:status
,
:project
,
:loaded
attr_accessor
:sha
,
:status
,
:
ref
,
:
project
,
:loaded
delegate
:commit
,
to: :project
...
...
@@ -16,12 +16,16 @@ module Gitlab
end
def
self
.
update_for_pipeline
(
pipeline
)
new
(
pipeline
.
project
,
sha:
pipeline
.
sha
,
status:
pipeline
.
status
).
store_in_cache_if_needed
new
(
pipeline
.
project
,
sha:
pipeline
.
sha
,
status:
pipeline
.
status
,
ref:
pipeline
.
ref
).
store_in_cache_if_needed
end
def
initialize
(
project
,
sha:
nil
,
status:
nil
)
def
initialize
(
project
,
sha:
nil
,
status:
nil
,
ref:
nil
)
@project
=
project
@sha
=
sha
@ref
=
ref
@status
=
status
end
...
...
@@ -35,37 +39,42 @@ module Gitlab
if
has_cache?
load_from_cache
else
load_from_
commi
t
load_from_
projec
t
store_in_cache
end
self
.
loaded
=
true
end
def
load_from_
commi
t
def
load_from_
projec
t
return
unless
commit
self
.
sha
=
commit
.
sha
self
.
status
=
commit
.
status
self
.
ref
=
project
.
default_branch
end
# We only cache the status for the HEAD commit of a project
# This status is rendered in project lists
def
store_in_cache_if_needed
return
unless
sha
return
delete_from_cache
unless
commit
store_in_cache
if
commit
.
sha
==
self
.
sha
return
unless
sha
return
unless
ref
if
commit
.
sha
==
sha
&&
project
.
default_branch
==
ref
store_in_cache
end
end
def
load_from_cache
Gitlab
::
Redis
.
with
do
|
redis
|
self
.
sha
,
self
.
status
=
redis
.
hmget
(
cache_key
,
:sha
,
:status
)
self
.
sha
,
self
.
status
,
self
.
ref
=
redis
.
hmget
(
cache_key
,
:sha
,
:status
,
:ref
)
end
end
def
store_in_cache
Gitlab
::
Redis
.
with
do
|
redis
|
redis
.
mapped_hmset
(
cache_key
,
{
sha:
sha
,
status:
status
})
redis
.
mapped_hmset
(
cache_key
,
{
sha:
sha
,
status:
status
,
ref:
ref
})
end
end
...
...
spec/lib/gitlab/cache/ci/project_pipeline_status_spec.rb
浏览文件 @
516a405e
...
...
@@ -17,7 +17,7 @@ describe Gitlab::Cache::Ci::ProjectPipelineStatus do
pipeline
=
build_stubbed
(
:ci_pipeline
,
sha:
'123456'
,
status:
'success'
)
fake_status
=
double
expect
(
described_class
).
to
receive
(
:new
).
with
(
pipeline
.
project
,
sha:
'123456'
,
status:
'success'
).
with
(
pipeline
.
project
,
sha:
'123456'
,
status:
'success'
,
ref:
'master'
).
and_return
(
fake_status
)
expect
(
fake_status
).
to
receive
(
:store_in_cache_if_needed
)
...
...
@@ -55,14 +55,14 @@ describe Gitlab::Cache::Ci::ProjectPipelineStatus do
it
'loads the status from the project commit when there is no cache'
do
allow
(
pipeline_status
).
to
receive
(
:has_cache?
).
and_return
(
false
)
expect
(
pipeline_status
).
to
receive
(
:load_from_
commi
t
)
expect
(
pipeline_status
).
to
receive
(
:load_from_
projec
t
)
pipeline_status
.
load_status
end
it
'stores the status in the cache when it loading it from the project'
do
allow
(
pipeline_status
).
to
receive
(
:has_cache?
).
and_return
(
false
)
allow
(
pipeline_status
).
to
receive
(
:load_from_
commi
t
)
allow
(
pipeline_status
).
to
receive
(
:load_from_
projec
t
)
expect
(
pipeline_status
).
to
receive
(
:store_in_cache
)
...
...
@@ -84,14 +84,15 @@ describe Gitlab::Cache::Ci::ProjectPipelineStatus do
end
end
describe
"#load_from_
commi
t"
do
describe
"#load_from_
projec
t"
do
let!
(
:pipeline
)
{
create
(
:ci_pipeline
,
:success
,
project:
project
,
sha:
project
.
commit
.
sha
)
}
it
'reads the status from the pipeline for the commit'
do
pipeline_status
.
load_from_
commi
t
pipeline_status
.
load_from_
projec
t
expect
(
pipeline_status
.
status
).
to
eq
(
'success'
)
expect
(
pipeline_status
.
sha
).
to
eq
(
project
.
commit
.
sha
)
expect
(
pipeline_status
.
ref
).
to
eq
(
project
.
default_branch
)
end
it
"doesn't fail for an empty project"
do
...
...
@@ -122,10 +123,11 @@ describe Gitlab::Cache::Ci::ProjectPipelineStatus do
build_status
=
described_class
.
load_for_project
(
project
)
build_status
.
store_in_cache_if_needed
sha
,
status
=
Gitlab
::
Redis
.
with
{
|
redis
|
redis
.
hmget
(
"projects/
#{
project
.
id
}
/build_status"
,
:sha
,
:status
)
}
sha
,
status
,
ref
=
Gitlab
::
Redis
.
with
{
|
redis
|
redis
.
hmget
(
"projects/
#{
project
.
id
}
/build_status"
,
:sha
,
:status
,
:ref
)
}
expect
(
sha
).
not_to
be_nil
expect
(
status
).
not_to
be_nil
expect
(
ref
).
not_to
be_nil
end
it
"doesn't store the status in redis when the sha is not the head of the project"
do
...
...
@@ -140,14 +142,15 @@ describe Gitlab::Cache::Ci::ProjectPipelineStatus do
it
"deletes the cache if the repository doesn't have a head commit"
do
empty_project
=
create
(
:empty_project
)
Gitlab
::
Redis
.
with
{
|
redis
|
redis
.
mapped_hmset
(
"projects/
#{
empty_project
.
id
}
/build_status"
,
{
sha:
"sha"
,
status:
"pending"
})
}
Gitlab
::
Redis
.
with
{
|
redis
|
redis
.
mapped_hmset
(
"projects/
#{
empty_project
.
id
}
/build_status"
,
{
sha:
"sha"
,
status:
"pending"
,
ref:
'master'
})
}
other_status
=
described_class
.
new
(
empty_project
,
sha:
"123456"
,
status:
"failed"
)
other_status
.
store_in_cache_if_needed
sha
,
status
=
Gitlab
::
Redis
.
with
{
|
redis
|
redis
.
hmget
(
"projects/
#{
empty_project
.
id
}
/build_status"
,
:sha
,
:status
)
}
sha
,
status
,
ref
=
Gitlab
::
Redis
.
with
{
|
redis
|
redis
.
hmget
(
"projects/
#{
empty_project
.
id
}
/build_status"
,
:sha
,
:status
,
:ref
)
}
expect
(
sha
).
to
be_nil
expect
(
status
).
to
be_nil
expect
(
ref
).
to
be_nil
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录