Commit 2d58bd00 authored by Kamil Trzciński's avatar Kamil Trzciński 🔴

Merge branch 'issue-67299-feature-flag' into 'master'

Disable interruptible pipeline feature flag by default

See merge request !16786
parents 58f0af10 cab0ccb9
Pipeline #82394590 passed with stages
in 43 minutes and 32 seconds
......@@ -95,7 +95,7 @@ module Ci
# rubocop: disable CodeReuse/ActiveRecord
def auto_cancelable_pipelines
# TODO: Introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23464
if Feature.enabled?(:ci_support_interruptible_pipelines, project, default_enabled: true)
if Feature.enabled?(:ci_support_interruptible_pipelines, project, default_enabled: false)
project.ci_pipelines
.where(ref: pipeline.ref)
.where.not(id: pipeline.id)
......
......@@ -317,9 +317,14 @@ describe Ci::CreatePipelineService do
context 'interruptible builds' do
before do
Feature.enable(:ci_support_interruptible_pipelines)
stub_ci_pipeline_yaml_file(YAML.dump(config))
end
after do
Feature.disable(:ci_support_interruptible_pipelines)
end
let(:config) do
{
stages: %w[stage1 stage2 stage3 stage4],
......
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