Read about our upcoming Code of Conduct on this issue

This instance will be upgraded to Heptapod 0.28.0 on 2022-01-18 at 14:00 UTC+1 (a few minutes of down time)

Commit 82ed2a09 authored by Kamil Trzcinski's avatar Kamil Trzcinski
Browse files

Improve config source handling code

parent 0cd0f2830519
......@@ -217,6 +217,7 @@ def variables(environment: persisted_environment)
variables += runner.predefined_variables if runner
variables += project.container_registry_variables
variables += project.deployment_variables if has_environment?
variables += project.auto_devops_variables
variables += yaml_variables
variables += user_variables
variables += project.group.secret_variables_for(ref, project).map(&:to_runner_variable) if project.group
......
......@@ -325,15 +325,11 @@ def has_warnings?
end
def set_config_source
self.config_source =
if project
case
when ci_yaml_from_repo then :repository_source
when implied_ci_yaml_file then :auto_devops_source
end
else
:unknown_source
end
if ci_yaml_from_repo
self.config_source = :repository_source
elsif implied_ci_yaml_file
self.config_source = :auto_devops_source
end
end
def config_processor
......@@ -461,12 +457,17 @@ def detailed_status(current_user)
private
def ci_yaml_from_repo
return unless project
return unless sha
project.repository.gitlab_ci_yml_for(sha, ci_yaml_file_path)
rescue GRPC::NotFound, Rugged::ReferenceError, GRPC::Internal
nil
end
def implied_ci_yaml_file
return unless project
if project.auto_devops_enabled?
Gitlab::Template::GitlabCiYmlTemplate.find('Auto-DevOps').content
end
......
......@@ -1390,7 +1390,7 @@ def full_path_slug
end
def predefined_variables
variables = [
[
{ key: 'CI_PROJECT_ID', value: id.to_s, public: true },
{ key: 'CI_PROJECT_NAME', value: path, public: true },
{ key: 'CI_PROJECT_PATH', value: full_path, public: true },
......@@ -1398,12 +1398,6 @@ def predefined_variables
{ key: 'CI_PROJECT_NAMESPACE', value: namespace.full_path, public: true },
{ key: 'CI_PROJECT_URL', value: web_url, public: true }
]
if auto_devops_enabled? && auto_devops&.domain
variables << { key: 'AUTO_DEVOPS_DOMAIN', value: auto_devops.domain, public: true }
end
variables
end
def container_registry_variables
......@@ -1440,6 +1434,12 @@ def deployment_variables
deployment_service.predefined_variables
end
def auto_devops_variables
return [] unless auto_devops_enabled?
auto_devops&.variables || []
end
def append_or_update_attribute(name, value)
old_values = public_send(name.to_s) # rubocop:disable GitlabSecurity/PublicSend
......
......@@ -2,4 +2,10 @@ class ProjectAutoDevops < ActiveRecord::Base
belongs_to :project
validates :domain, presence: true, hostname: { allow_numeric_hostname: true }, if: :enabled?
def variables
variables = []
variables << { key: 'AUTO_DEVOPS_DOMAIN', value: domain, public: true } if domain.present?
variables
end
end
......@@ -832,10 +832,10 @@ def create_pipeline(status, ref, sha)
describe '#ci_yaml_file' do
let(:implied_yml) { Gitlab::Template::GitlabCiYmlTemplate.find('Auto-DevOps').content }
before { pipeline.detect_ci_yaml_file }
context 'the source is unknown' do
before { pipeline.unknown_source! }
before do
pipeline.unknown_source!
end
it 'returns the configuration if found' do
allow(pipeline.project.repository).to receive(:gitlab_ci_yml_for)
......@@ -854,7 +854,9 @@ def create_pipeline(status, ref, sha)
end
context 'the source is the repository' do
before { pipeline.repository_source! }
before do
pipeline.repository_source!
end
it 'returns the configuration if found' do
allow(pipeline.project.repository).to receive(:gitlab_ci_yml_for)
......@@ -867,7 +869,9 @@ def create_pipeline(status, ref, sha)
end
context 'when the source is auto_devops_source' do
before { pipeline.auto_devops_source! }
before do
pipeline.auto_devops_source!
end
it 'finds the implied config' do
allow_any_instance_of(ApplicationSetting)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment