summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2019-08-14 15:59:44 +0200
committerKamil Trzciński <ayufan@ayufan.eu>2019-08-14 15:59:44 +0200
commit72541807b34348e7fa7e7d1ef7d119376382d8af (patch)
treec295e2c50bf23bda413b861d294741e1d5683599
parentfcc20fde8346a9c2dd9e79ded2557c8058ac1e22 (diff)
downloadgitlab-ce-enable-dag-support-by-default.tar.gz
Enable DAG support by defaultenable-dag-support-by-default
This toggles the ci_dag_support flag to be on by default. This relies on ci_dag_limit_needs to be present to reduce amount of inter-dependencies between jobs
-rw-r--r--app/models/ci/build.rb2
-rw-r--r--app/services/ci/process_pipeline_service.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index f705e67121f..3c0efca31db 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -716,7 +716,7 @@ module Ci
depended_jobs = depends_on_builds
# find all jobs that are needed
- if Feature.enabled?(:ci_dag_support, project) && needs.exists?
+ if Feature.enabled?(:ci_dag_support, project, default_enabled: true) && needs.exists?
depended_jobs = depended_jobs.where(name: needs.select(:name))
end
diff --git a/app/services/ci/process_pipeline_service.rb b/app/services/ci/process_pipeline_service.rb
index 99d4ff9ecd1..062a47f6027 100644
--- a/app/services/ci/process_pipeline_service.rb
+++ b/app/services/ci/process_pipeline_service.rb
@@ -40,7 +40,7 @@ module Ci
def process_builds_with_needs(trigger_build_ids)
return false unless trigger_build_ids.present?
- return false unless Feature.enabled?(:ci_dag_support, project)
+ return false unless Feature.enabled?(:ci_dag_support, project, default_enabled: true)
# rubocop: disable CodeReuse/ActiveRecord
trigger_build_names = pipeline.statuses
@@ -97,7 +97,7 @@ module Ci
# rubocop: enable CodeReuse/ActiveRecord
def created_processables_without_needs
- if Feature.enabled?(:ci_dag_support, project)
+ if Feature.enabled?(:ci_dag_support, project, default_enabled: true)
pipeline.processables.created.without_needs
else
pipeline.processables.created