Skip to content
Snippets Groups Projects
Commit 9b2ae90d authored by Z.J. van de Weg's avatar Z.J. van de Weg
Browse files

Remove references to build in pipeline charts

Being the good boyscouts, but mainly because of [the comment in the
review](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12378#note_33302115)
the words used for classes and variables are changed to not use builds
anymore.
parent 13d39971
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -135,7 +135,7 @@ class Projects::PipelinesController < Projects::ApplicationController
@charts[:week] = Ci::Charts::WeekChart.new(project)
@charts[:month] = Ci::Charts::MonthChart.new(project)
@charts[:year] = Ci::Charts::YearChart.new(project)
@charts[:build_times] = Ci::Charts::BuildTime.new(project)
@charts[:pipeline_times] = Ci::Charts::PipelineTime.new(project)
 
@counts = {}
@counts[:total] = @project.pipelines.count(:all)
Loading
Loading
Loading
Loading
@@ -17,10 +17,10 @@ module GraphHelper
ids.zip(parent_spaces)
end
 
def success_ratio(success:, failed:)
return 100 if failed.zero?
def success_ratio(counts)
return 100 if counts[:failed].zero?
 
ratio = (success.to_f / (success + failed)) * 100
ratio = (counts[:success].to_f / (counts[:success] + counts[:failed])) * 100
ratio.to_i
end
end
Loading
Loading
@@ -15,7 +15,7 @@
.col-md-6
= render 'projects/pipelines/charts/overall'
.col-md-6
= render 'projects/pipelines/charts/build_times'
= render 'projects/pipelines/charts/pipeline_times'
 
%hr
= render 'projects/pipelines/charts/builds'
= render 'projects/pipelines/charts/pipelines'
Loading
Loading
@@ -6,7 +6,7 @@
 
:javascript
var data = {
labels : #{@charts[:build_times].labels.to_json},
labels : #{@charts[:pipeline_times].labels.to_json},
datasets : [
{
fillColor : "rgba(220,220,220,0.5)",
Loading
Loading
@@ -14,7 +14,7 @@
barStrokeWidth: 1,
barValueSpacing: 1,
barDatasetSpacing: 1,
data : #{@charts[:build_times].build_times.to_json}
data : #{@charts[:pipeline_times].pipeline_times.to_json}
}
]
}
Loading
Loading
Loading
Loading
@@ -33,13 +33,13 @@ module Ci
end
 
class Chart
attr_reader :labels, :total, :success, :project, :build_times
attr_reader :labels, :total, :success, :project, :pipeline_times
 
def initialize(project)
@labels = []
@total = []
@success = []
@build_times = []
@pipeline_times = []
@project = project
 
collect
Loading
Loading
@@ -101,14 +101,14 @@ module Ci
end
end
 
class BuildTime < Chart
class PipelineTime < Chart
def collect
commits = project.pipelines.last(30)
 
commits.each do |commit|
@labels << commit.short_sha
duration = commit.duration || 0
@build_times << (duration / 60)
@pipeline_times << (duration / 60)
end
end
end
Loading
Loading
require 'spec_helper'
 
describe Ci::Charts, lib: true do
context "build_times" do
context "pipeline_times" do
let(:project) { create(:empty_project) }
let(:chart) { Ci::Charts::BuildTime.new(project) }
let(:chart) { Ci::Charts::PipelineTime.new(project) }
 
subject { chart.build_times }
subject { chart.pipeline_times }
 
before do
create(:ci_empty_pipeline, project: project, duration: 120)
end
 
it 'returns build times in minutes' do
it 'returns pipeline times in minutes' do
is_expected.to contain_exactly(2)
end
 
it 'handles nil build times' do
it 'handles nil pipeline times' do
create(:ci_empty_pipeline, project: project, duration: nil)
 
is_expected.to contain_exactly(2, 0)
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment