diff options
| author | James Fargher <proglottis@gmail.com> | 2019-07-18 15:45:12 +1200 |
|---|---|---|
| committer | James Fargher <proglottis@gmail.com> | 2019-07-19 09:23:07 +1200 |
| commit | 01431ae3076370bec1c014e326cdb20b47ae55b1 (patch) | |
| tree | de042beee18387364ff8420322b31952822b35c1 /app | |
| parent | 34f5eb1b93b5c1e7d8ed8d578d8b94cd33d2dca3 (diff) | |
| download | gitlab-ce-auto_devops_detect2.tar.gz | |
Initial detection of Auto-DevOps buildable projectsauto_devops_detect2
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/ci/pipeline.rb | 7 | ||||
| -rw-r--r-- | app/models/project.rb | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 2262282e647..c44f0a42585 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -809,11 +809,16 @@ module Ci def implied_ci_yaml_file return unless project - if project.auto_devops_enabled? + if project.auto_devops_enabled? && auto_devops_buildable? Gitlab::Template::GitlabCiYmlTemplate.find('Auto-DevOps').content end end + def auto_devops_buildable? + project.has_auto_devops_explicitly_enabled? || + Gitlab::AutoDevops::BuildableDetector.new(project, sha).buildable? + end + def pipeline_data Gitlab::DataBuilder::Pipeline.build(self) end diff --git a/app/models/project.rb b/app/models/project.rb index 2906aca75fc..e3e177c97e2 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -665,10 +665,14 @@ class Project < ApplicationRecord if auto_devops&.enabled.nil? has_auto_devops_implicitly_enabled? else - auto_devops.enabled? + has_auto_devops_explicitly_enabled? end end + def has_auto_devops_explicitly_enabled? + auto_devops&.enabled? + end + def has_auto_devops_implicitly_enabled? auto_devops_config = first_auto_devops_config |