kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Actually we still need to use total - running to get:

Browse source 
real pending time, because that's actually by definition,
(the time that it's not running!)
or we could end up with awfully complicated algorithm :(
This commit is contained in:
Lin Jen-Shin 2016-09-02 21:08:26 +08:00
parent 1ccb578ec8
commit defd889905
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/gitlab/ci/pipeline_duration.rb
View file

@ -110,10 +110,11 @@ module Gitlab
status = %w[success failed running canceled]
builds = pipeline.builds.latest.where(status: status)
duration = from_builds(builds, :started_at, :finished_at).duration
queued = from_builds(builds, :queued_at, :started_at).duration
running = from_builds(builds, :started_at, :finished_at).duration
total = from_builds(builds, :queued_at, :finished_at).duration
pending = pipeline.started_at - pipeline.created_at
[duration, pipeline.started_at - pipeline.created_at + queued]
[running, pending + total - running]
end
def self.from_builds(builds, from, to)

17
spec/models/ci/pipeline_spec.rb
View file

@ -125,7 +125,8 @@ describe Ci::Pipeline, models: true do
describe 'state machine' do
let(:current) { Time.now.change(usec: 0) }
let(:build) { create_build('build1', current, 10) }
let(:another_build) { create_build('build2', current + 80, 5) }
let(:build_b) { create_build('build2', current, 20) }
let(:build_c) { create_build('build3', current + 40, 20) }
describe '#duration and #pending_duration' do
before do
@ -136,12 +137,16 @@ describe Ci::Pipeline, models: true do
pipeline.save
end
travel_to(current + 70) do
travel_to(current + 30) do
build.success
end
travel_to(current + 145) do
another_build.drop
travel_to(current + 40) do
build_b.drop
end
travel_to(current + 70) do
build_c.success
end
pipeline.drop
@ -150,8 +155,8 @@ describe Ci::Pipeline, models: true do
it 'matches sum of builds duration' do
pipeline.reload
expect(pipeline.duration).to eq(70 - 10 + 145 - 85)
expect(pipeline.pending_duration).to eq(5 + 10 + 5)
expect(pipeline.duration).to eq(40)
expect(pipeline.pending_duration).to eq(35)
end
end