Commit 6de9946c authored by Shinya Maeda's avatar Shinya Maeda

Merge branch '339024-feature-flag-rollout-of-env_vars_resource_group' into 'master'

Remove feature flag 'env_vars_resource_group'

See merge request gitlab-org/gitlab!70014
parents 588ab09f 61d86ca7
---
name: env_vars_resource_group
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67876
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/339024
milestone: '14.3'
type: development
group: group::release
default_enabled: false
...@@ -35,7 +35,7 @@ module Gitlab ...@@ -35,7 +35,7 @@ module Gitlab
def variables def variables
processable.simple_variables.tap do |variables| processable.simple_variables.tap do |variables|
# Adding persisted environment variables # Adding persisted environment variables
if Feature.enabled?(:env_vars_resource_group) && processable.persisted_environment.present? if processable.persisted_environment.present?
variables.concat(processable.persisted_environment.predefined_variables) variables.concat(processable.persisted_environment.predefined_variables)
end end
end end
......
...@@ -1041,22 +1041,6 @@ RSpec.describe Ci::CreatePipelineService do ...@@ -1041,22 +1041,6 @@ RSpec.describe Ci::CreatePipelineService do
expect(execute_service.payload).to be_created_successfully expect(execute_service.payload).to be_created_successfully
end end
context 'when the env_vars_resource_group feature flag is disabled' do
before do
stub_feature_flags(env_vars_resource_group: false)
end
it 'does not create a resource group because its key contains an invalid character' do
result = execute_service.payload
deploy_job = result.builds.find_by_name!(:review_app)
stop_job = result.builds.find_by_name!(:stop_review_app)
expect(result).to be_persisted
expect(deploy_job.resource_group).to be_nil
expect(stop_job.resource_group).to be_nil
expect(project.resource_groups.count).to eq(0)
end
end
end end
context 'with timeout' do context 'with timeout' do
......
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