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
7fe2653c
Commit
7fe2653c
authored
Dec 06, 2021
by
Maxime Orefice
Committed by
Dylan Griffith
Dec 06, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove ci_pending_builds_async_update feature flag
parent
6b591ca2
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
2 additions
and
46 deletions
+2
-46
app/services/groups/transfer_service.rb
app/services/groups/transfer_service.rb
+1
-5
app/services/projects/transfer_service.rb
app/services/projects/transfer_service.rb
+1
-5
config/feature_flags/development/ci_pending_builds_async_update.yml
...ture_flags/development/ci_pending_builds_async_update.yml
+0
-8
spec/services/groups/transfer_service_spec.rb
spec/services/groups/transfer_service_spec.rb
+0
-14
spec/services/projects/transfer_service_spec.rb
spec/services/projects/transfer_service_spec.rb
+0
-14
No files found.
app/services/groups/transfer_service.rb
View file @
7fe2653c
...
@@ -229,11 +229,7 @@ module Groups
...
@@ -229,11 +229,7 @@ module Groups
end
end
def
update_pending_builds
def
update_pending_builds
if
Feature
.
enabled?
(
:ci_pending_builds_async_update
,
default_enabled: :yaml
)
::
Ci
::
PendingBuilds
::
UpdateGroupWorker
.
perform_async
(
group
.
id
,
pending_builds_params
)
::
Ci
::
PendingBuilds
::
UpdateGroupWorker
.
perform_async
(
group
.
id
,
pending_builds_params
)
else
::
Ci
::
UpdatePendingBuildService
.
new
(
group
,
pending_builds_params
).
execute
end
end
end
def
pending_builds_params
def
pending_builds_params
...
...
app/services/projects/transfer_service.rb
View file @
7fe2653c
...
@@ -245,11 +245,7 @@ module Projects
...
@@ -245,11 +245,7 @@ module Projects
end
end
def
update_pending_builds
def
update_pending_builds
if
Feature
.
enabled?
(
:ci_pending_builds_async_update
,
default_enabled: :yaml
)
::
Ci
::
PendingBuilds
::
UpdateProjectWorker
.
perform_async
(
project
.
id
,
pending_builds_params
)
::
Ci
::
PendingBuilds
::
UpdateProjectWorker
.
perform_async
(
project
.
id
,
pending_builds_params
)
else
::
Ci
::
UpdatePendingBuildService
.
new
(
project
,
pending_builds_params
).
execute
end
end
end
def
pending_builds_params
def
pending_builds_params
...
...
config/feature_flags/development/ci_pending_builds_async_update.yml
deleted
100644 → 0
View file @
6b591ca2
---
name
:
ci_pending_builds_async_update
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75197
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/346641
milestone
:
'
14.6'
type
:
development
group
:
group::pipeline execution
default_enabled
:
false
spec/services/groups/transfer_service_spec.rb
View file @
7fe2653c
...
@@ -814,20 +814,6 @@ RSpec.describe Groups::TransferService, :sidekiq_inline do
...
@@ -814,20 +814,6 @@ RSpec.describe Groups::TransferService, :sidekiq_inline do
expect
(
unrelated_pending_build
.
namespace_id
).
to
eq
(
other_project
.
namespace_id
)
expect
(
unrelated_pending_build
.
namespace_id
).
to
eq
(
other_project
.
namespace_id
)
expect
(
unrelated_pending_build
.
namespace_traversal_ids
).
to
eq
(
other_project
.
namespace
.
traversal_ids
)
expect
(
unrelated_pending_build
.
namespace_traversal_ids
).
to
eq
(
other_project
.
namespace
.
traversal_ids
)
end
end
context
'when ci_pending_builds_async_update is disabled'
do
let
(
:update_pending_build_service
)
{
instance_double
(
::
Ci
::
PendingBuilds
::
UpdateGroupWorker
)
}
before
do
stub_feature_flags
(
ci_pending_builds_async_update:
false
)
end
it
'does not call the new worker'
do
expect
(
::
Ci
::
PendingBuilds
::
UpdateGroupWorker
).
not_to
receive
(
:perform_async
)
transfer_service
.
execute
(
new_parent_group
)
end
end
end
end
end
end
...
...
spec/services/projects/transfer_service_spec.rb
View file @
7fe2653c
...
@@ -189,20 +189,6 @@ RSpec.describe Projects::TransferService do
...
@@ -189,20 +189,6 @@ RSpec.describe Projects::TransferService do
expect
(
unrelated_pending_build
.
namespace_id
).
to
eq
(
other_project
.
namespace_id
)
expect
(
unrelated_pending_build
.
namespace_id
).
to
eq
(
other_project
.
namespace_id
)
expect
(
unrelated_pending_build
.
namespace_traversal_ids
).
to
eq
(
other_project
.
namespace
.
traversal_ids
)
expect
(
unrelated_pending_build
.
namespace_traversal_ids
).
to
eq
(
other_project
.
namespace
.
traversal_ids
)
end
end
context
'when ci_pending_builds_async_update is disabled'
do
let
(
:update_pending_build_service
)
{
instance_double
(
::
Ci
::
PendingBuilds
::
UpdateProjectWorker
)
}
before
do
stub_feature_flags
(
ci_pending_builds_async_update:
false
)
end
it
'does not call the new worker'
do
expect
(
::
Ci
::
PendingBuilds
::
UpdateProjectWorker
).
not_to
receive
(
:perform_async
)
execute_transfer
end
end
end
end
end
end
...
...
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