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

Split pipelines by origin on usage data

When sending the usage data, it now includes all pipelines. This commit
will split the pipelines in two; internal and external.

This will lead to historical data being incorrectly marked this way.

Fixes gitlab-org/gitlab-ce#33172
parent 9c7bf123
No related branches found
No related tags found
2 merge requests!14773Maxraab master patch 51809,!12277Only count GL pipelines in usage data ping
Pipeline #
Loading
Loading
@@ -140,6 +140,7 @@ module Ci
where(id: max_id)
end
end
scope :internal, -> { where(source: internal_sources) }
 
def self.latest_status(ref = nil)
latest(ref).status
Loading
Loading
@@ -163,6 +164,10 @@ module Ci
where.not(duration: nil).sum(:duration)
end
 
def self.internal_sources
sources.reject { |source| source == "external" }.values
end
def stages_count
statuses.select(:stage).distinct.count
end
Loading
Loading
---
title: Split pipelines as internal and external in the usage data
merge_request: 12277
author:
Loading
Loading
@@ -20,7 +20,8 @@ module Gitlab
counts: {
boards: Board.count,
ci_builds: ::Ci::Build.count,
ci_pipelines: ::Ci::Pipeline.count,
ci_internal_pipelines: ::Ci::Pipeline.internal.count,
ci_external_pipelines: ::Ci::Pipeline.external.count,
ci_runners: ::Ci::Runner.count,
ci_triggers: ::Ci::Trigger.count,
ci_pipeline_schedules: ::Ci::PipelineSchedule.count,
Loading
Loading
Loading
Loading
@@ -30,7 +30,8 @@ describe Gitlab::UsageData do
expect(count_data.keys).to match_array(%i(
boards
ci_builds
ci_pipelines
ci_internal_pipelines
ci_external_pipelines
ci_runners
ci_triggers
ci_pipeline_schedules
Loading
Loading
Loading
Loading
@@ -672,6 +672,12 @@ describe Ci::Pipeline, models: true do
end
end
 
describe '.internal_sources' do
subject { described_class.internal_sources }
it { is_expected.to be_an(Array) }
end
describe '#status' do
let(:build) do
create(:ci_build, :created, pipeline: pipeline, name: 'test')
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