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

Decouple YAML processor from pipeline objects

Browse source
This commit is contained in:
Grzegorz Bizon 2018-03-22 13:57:39 +01:00
parent 0e51842dca
commit 000f9d01f7
3 changed files with 46 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/models/ci/pipeline.rb
View file

@ -362,7 +362,13 @@ module Ci
def stage_seeds
return [] unless config_processor
@stage_seeds ||= config_processor.stage_seeds(self)
strong_memoize(:stage_seeds) do
seeds = config_processor.stages.map do |attributes|
Gitlab::Ci::Pipeline::Seed::Stage.new(self, attributes)
end
seeds.select(&:included?)
end
end
def has_kubernetes_active?

54
lib/gitlab/ci/yaml_processor.rb
View file

@ -53,62 +53,42 @@ module Gitlab
}.compact }
end
# REFACTORING, this needs improvement
# REFACTORING, this needs improvement, and specs
#
def build_seed_attributes(stage)
def stage_attributes(stage)
selected = @jobs.values.select do |job|
job[:stage] == stage
end
selected.map do |job|
build_attributes(job[:name])
end
end
# REFACTORING, needs specs
#
def seed_attributes(stage)
seeds = stage_attributes(stage).map do |attributes|
job = @jobs.fetch(attributes[:name].to_sym)
attributes
.merge(only: job.fetch(:only, {}))
.merge(except: job.fetch(:except, {}))
end
end
# REFACTORING, slated for removal
#
def pipeline_stage_builds(stage, pipeline)
selected_jobs = @jobs.select do |_, job|
next unless job[:stage] == stage
only_specs = Gitlab::Ci::Build::Policy
.fabricate(job.fetch(:only, {}))
except_specs = Gitlab::Ci::Build::Policy
.fabricate(job.fetch(:except, {}))
only_specs.all? { |spec| spec.satisfied_by?(pipeline) } &&
except_specs.none? { |spec| spec.satisfied_by?(pipeline) }
end
selected_jobs.map { |_, job| build_attributes(job[:name]) }
end
def stage_seed_attributes(stage)
{ name: stage,
index: @stages.index(stage),
builds: build_seed_attributes(stage) }
builds: seeds }
end
# REFACTORING, slated for removal
# * WARNING this method is currently evaluating only/except policies
# in two places - Seed::Build, and in pipeline_stage_builds
# * WARNING it needs to be refactored to use SSOT
# REFACTORING, needs specs
#
def stage_seeds(pipeline)
seeds = @stages.uniq.map do |stage|
builds = pipeline_stage_builds(stage, pipeline)
if builds.any?
Gitlab::Ci::Pipeline::Seed::Stage
.new(pipeline, stage_seed_attributes(stage))
def stages
@stages.uniq.map do |stage|
seed_attributes(stage)
end
end
seeds.compact
end
def self.validation_message(content)
return 'Please provide content of .gitlab-ci.yml' if content.blank?

44
spec/lib/gitlab/ci/yaml_processor_spec.rb
View file

@ -203,7 +203,7 @@ module Gitlab
let(:config_data) { YAML.dump(config) }
let(:config_processor) { Gitlab::Ci::YamlProcessor.new(config_data) }
subject { config_processor.pipeline_stage_builds("test", pipeline(ref: "master")).first }
subject { config_processor.stage_attributes('test').first }
describe "before_script" do
context "in global context" do
@ -286,8 +286,8 @@ module Gitlab
config_processor = Gitlab::Ci::YamlProcessor.new(config)
expect(config_processor.pipeline_stage_builds("test", pipeline(ref: "master")).size).to eq(1)
expect(config_processor.pipeline_stage_builds("test", pipeline(ref: "master")).first).to eq({
expect(config_processor.stage_attributes("test").size).to eq(1)
expect(config_processor.stage_attributes("test").first).to eq({
stage: "test",
stage_idx: 1,
name: "rspec",
@ -321,8 +321,8 @@ module Gitlab
config_processor = Gitlab::Ci::YamlProcessor.new(config)
expect(config_processor.pipeline_stage_builds("test", pipeline(ref: "master")).size).to eq(1)
expect(config_processor.pipeline_stage_builds("test", pipeline(ref: "master")).first).to eq({
expect(config_processor.stage_attributes("test").size).to eq(1)
expect(config_processor.stage_attributes("test").first).to eq({
stage: "test",
stage_idx: 1,
name: "rspec",
@ -354,8 +354,8 @@ module Gitlab
config_processor = Gitlab::Ci::YamlProcessor.new(config)
expect(config_processor.pipeline_stage_builds("test", pipeline(ref: "master")).size).to eq(1)
expect(config_processor.pipeline_stage_builds("test", pipeline(ref: "master")).first).to eq({
expect(config_processor.stage_attributes("test").size).to eq(1)
expect(config_processor.stage_attributes("test").first).to eq({
stage: "test",
stage_idx: 1,
name: "rspec",
@ -383,8 +383,8 @@ module Gitlab
config_processor = Gitlab::Ci::YamlProcessor.new(config)
expect(config_processor.pipeline_stage_builds("test", pipeline(ref: "master")).size).to eq(1)
expect(config_processor.pipeline_stage_builds("test", pipeline(ref: "master")).first).to eq({
expect(config_processor.stage_attributes("test").size).to eq(1)
expect(config_processor.stage_attributes("test").first).to eq({
stage: "test",
stage_idx: 1,
name: "rspec",
@ -529,8 +529,8 @@ module Gitlab
})
config_processor = Gitlab::Ci::YamlProcessor.new(config)
builds = config_processor.stage_attributes("test")
builds = config_processor.pipeline_stage_builds("test", pipeline(ref: "master"))
expect(builds.size).to eq(1)
expect(builds.first[:when]).to eq(when_state)
end
@ -561,8 +561,8 @@ module Gitlab
config_processor = Gitlab::Ci::YamlProcessor.new(config)
expect(config_processor.pipeline_stage_builds("test", pipeline(ref: "master")).size).to eq(1)
expect(config_processor.pipeline_stage_builds("test", pipeline(ref: "master")).first[:options][:cache]).to eq(
expect(config_processor.stage_attributes("test").size).to eq(1)
expect(config_processor.stage_attributes("test").first[:options][:cache]).to eq(
paths: ["logs/", "binaries/"],
untracked: true,
key: 'key',
@ -580,8 +580,8 @@ module Gitlab
config_processor = Gitlab::Ci::YamlProcessor.new(config)
expect(config_processor.pipeline_stage_builds("test", pipeline(ref: "master")).size).to eq(1)
expect(config_processor.pipeline_stage_builds("test", pipeline(ref: "master")).first[:options][:cache]).to eq(
expect(config_processor.stage_attributes("test").size).to eq(1)
expect(config_processor.stage_attributes("test").first[:options][:cache]).to eq(
paths: ["logs/", "binaries/"],
untracked: true,
key: 'key',
@ -600,8 +600,8 @@ module Gitlab
config_processor = Gitlab::Ci::YamlProcessor.new(config)
expect(config_processor.pipeline_stage_builds("test", pipeline(ref: "master")).size).to eq(1)
expect(config_processor.pipeline_stage_builds("test", pipeline(ref: "master")).first[:options][:cache]).to eq(
expect(config_processor.stage_attributes("test").size).to eq(1)
expect(config_processor.stage_attributes("test").first[:options][:cache]).to eq(
paths: ["test/"],
untracked: false,
key: 'local',
@ -629,8 +629,8 @@ module Gitlab
config_processor = Gitlab::Ci::YamlProcessor.new(config)
expect(config_processor.pipeline_stage_builds("test", pipeline(ref: "master")).size).to eq(1)
expect(config_processor.pipeline_stage_builds("test", pipeline(ref: "master")).first).to eq({
expect(config_processor.stage_attributes("test").size).to eq(1)
expect(config_processor.stage_attributes("test").first).to eq({
stage: "test",
stage_idx: 1,
name: "rspec",
@ -666,8 +666,8 @@ module Gitlab
})
config_processor = Gitlab::Ci::YamlProcessor.new(config)
builds = config_processor.stage_attributes("test")
builds = config_processor.pipeline_stage_builds("test", pipeline(ref: "master"))
expect(builds.size).to eq(1)
expect(builds.first[:options][:artifacts][:when]).to eq(when_state)
end
@ -682,7 +682,7 @@ module Gitlab
end
let(:processor) { Gitlab::Ci::YamlProcessor.new(YAML.dump(config)) }
let(:builds) { processor.pipeline_stage_builds('deploy', pipeline(ref: 'master')) }
let(:builds) { processor.stage_attributes('deploy') }
context 'when a production environment is specified' do
let(:environment) { 'production' }
@ -839,7 +839,7 @@ module Gitlab
describe "Hidden jobs" do
let(:config_processor) { Gitlab::Ci::YamlProcessor.new(config) }
subject { config_processor.pipeline_stage_builds("test", pipeline(ref: "master")) }
subject { config_processor.stage_attributes("test") }
shared_examples 'hidden_job_handling' do
it "doesn't create jobs that start with dot" do
@ -887,7 +887,7 @@ module Gitlab
describe "YAML Alias/Anchor" do
let(:config_processor) { Gitlab::Ci::YamlProcessor.new(config) }
subject { config_processor.pipeline_stage_builds("build", pipeline(ref: "master")) }
subject { config_processor.stage_attributes("build") }
shared_examples 'job_templates_handling' do
it "is correctly supported for jobs" do