Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
61d86ca7
Commit
61d86ca7
authored
Sep 09, 2021
by
Allen Cook
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove feature flag for env_vars_resource_group
Changelog: removed
parent
8421b14b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
25 deletions
+1
-25
config/feature_flags/development/env_vars_resource_group.yml
config/feature_flags/development/env_vars_resource_group.yml
+0
-8
lib/gitlab/ci/pipeline/seed/processable/resource_group.rb
lib/gitlab/ci/pipeline/seed/processable/resource_group.rb
+1
-1
spec/services/ci/create_pipeline_service_spec.rb
spec/services/ci/create_pipeline_service_spec.rb
+0
-16
No files found.
config/feature_flags/development/env_vars_resource_group.yml
deleted
100644 → 0
View file @
8421b14b
---
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
lib/gitlab/ci/pipeline/seed/processable/resource_group.rb
View file @
61d86ca7
...
...
@@ -35,7 +35,7 @@ module Gitlab
def
variables
processable
.
simple_variables
.
tap
do
|
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
)
end
end
...
...
spec/services/ci/create_pipeline_service_spec.rb
View file @
61d86ca7
...
...
@@ -1041,22 +1041,6 @@ RSpec.describe Ci::CreatePipelineService do
expect
(
execute_service
.
payload
).
to
be_created_successfully
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
context
'with timeout'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment