From 72541807b34348e7fa7e7d1ef7d119376382d8af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Wed, 14 Aug 2019 15:59:44 +0200
Subject: [PATCH] Enable 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
---
app/models/ci/build.rb | 2 +-
app/services/ci/process_pipeline_service.rb | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index f705e67121fe..3c0efca31db1 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -716,7 +716,7 @@ def dependencies
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 99d4ff9ecd1d..062a47f6027d 100644
--- a/app/services/ci/process_pipeline_service.rb
+++ b/app/services/ci/process_pipeline_service.rb
@@ -40,7 +40,7 @@ def process_stage_without_needs(index)
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 @@ def created_processables_in_stage_without_needs(index)
# 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
--
GitLab