From d6c3446df5d238480d479861f2f3985f8e593306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= Date: Mon, 3 Sep 2018 19:15:28 +0200 Subject: Start to remove config processor from Ci::Pipeline --- app/models/ci/build.rb | 6 ------ app/models/ci/pipeline.rb | 4 ---- spec/models/ci/pipeline_spec.rb | 17 ----------------- 3 files changed, 27 deletions(-) diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 221cba8047a..a56cde7fbb4 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -797,12 +797,6 @@ module Ci options&.dig(:environment, :url) || persisted_environment&.external_url end - def build_attributes_from_config - return {} unless pipeline.config_processor - - pipeline.config_processor.build_attributes(name) - end - def update_project_statistics_after_save update_project_statistics(read_attribute(:artifacts_size).to_i - artifacts_size_was.to_i) end diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 526bf7af99b..00aa8d136ba 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -419,10 +419,6 @@ module Ci end end - def seeds_size - stage_seeds.sum(&:size) - end - def has_kubernetes_active? project.deployment_platform&.active? end diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb index 77b7332a761..2d5a1bcf046 100644 --- a/spec/models/ci/pipeline_spec.rb +++ b/spec/models/ci/pipeline_spec.rb @@ -399,23 +399,6 @@ describe Ci::Pipeline, :mailer do end end - describe '#seeds_size' do - context 'when refs policy is specified' do - let(:config) do - { production: { stage: 'deploy', script: 'cap prod', only: ['master'] }, - spinach: { stage: 'test', script: 'spinach', only: ['tags'] } } - end - - let(:pipeline) do - build(:ci_pipeline, ref: 'feature', tag: true, config: config) - end - - it 'returns real seeds size' do - expect(pipeline.seeds_size).to eq 1 - end - end - end - describe 'legacy stages' do before do create(:commit_status, pipeline: pipeline, -- cgit v1.2.1