Commit 63f8cbe8 authored by Sean Arnold's avatar Sean Arnold

Merge branch 'sh-enable-ci-variable-caching-default' into 'master'

Remove enable_ci_variable_caching feature flag

See merge request gitlab-org/gitlab!79819
parents 1b1c1296 5d1068bd
...@@ -31,8 +31,6 @@ module Ci ...@@ -31,8 +31,6 @@ module Ci
end end
def to_runner_variable def to_runner_variable
return uncached_runner_variable unless ::Gitlab::SafeRequestStore.read(:enable_ci_variable_caching)
var_cache_key = to_runner_variable_cache_key var_cache_key = to_runner_variable_cache_key
return uncached_runner_variable unless var_cache_key return uncached_runner_variable unless var_cache_key
......
...@@ -63,8 +63,6 @@ module Ci ...@@ -63,8 +63,6 @@ module Ci
@logger = build_logger @logger = build_logger
@pipeline = Ci::Pipeline.new @pipeline = Ci::Pipeline.new
::Gitlab::SafeRequestStore.write(:enable_ci_variable_caching, ::Feature.enabled?(:enable_ci_variable_caching, project, default_enabled: :yaml))
command = Gitlab::Ci::Pipeline::Chain::Command.new( command = Gitlab::Ci::Pipeline::Chain::Command.new(
source: source, source: source,
origin_ref: params[:ref], origin_ref: params[:ref],
......
---
name: enable_ci_variable_caching
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78440
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/350529
milestone: '14.8'
type: development
group: group::pipeline execution
default_enabled: false
...@@ -88,12 +88,6 @@ RSpec.describe Ci::HasVariable do ...@@ -88,12 +88,6 @@ RSpec.describe Ci::HasVariable do
} }
end end
before do
# CreatePipelineService normally writes this because this feature flag
# cannot be checked in a tight loop
::Gitlab::SafeRequestStore[:enable_ci_variable_caching] = true
end
it 'decrypts once' do it 'decrypts once' do
expect(OpenSSL::PKCS5).to receive(:pbkdf2_hmac).once.and_call_original expect(OpenSSL::PKCS5).to receive(:pbkdf2_hmac).once.and_call_original
...@@ -116,20 +110,6 @@ RSpec.describe Ci::HasVariable do ...@@ -116,20 +110,6 @@ RSpec.describe Ci::HasVariable do
expect(new_variable.to_runner_variable).not_to eq(old_value) expect(new_variable.to_runner_variable).not_to eq(old_value)
end end
context 'with enable_ci_variable_caching feature flag disabled' do
before do
# CreatePipelineService normally writes this because this feature flag
# cannot be checked in a tight loop
::Gitlab::SafeRequestStore[:enable_ci_variable_caching] = false
end
it 'decrypts twice' do
expect(OpenSSL::PKCS5).to receive(:pbkdf2_hmac).twice.and_call_original
2.times { expect(subject.reload.to_runner_variable).to eq(expected) }
end
end
end end
end end
end end
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