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
463d58cc
Commit
463d58cc
authored
Dec 01, 2020
by
Furkan Ayhan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove feature flag ci_manual_bridges
It was enabled by default 2 milestones ago
parent
e38dc069
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
2 additions
and
61 deletions
+2
-61
app/controllers/projects/jobs_controller.rb
app/controllers/projects/jobs_controller.rb
+1
-5
app/models/ci/bridge.rb
app/models/ci/bridge.rb
+0
-4
config/feature_flags/development/ci_manual_bridges.yml
config/feature_flags/development/ci_manual_bridges.yml
+0
-8
doc/ci/yaml/README.md
doc/ci/yaml/README.md
+0
-6
lib/gitlab/ci/features.rb
lib/gitlab/ci/features.rb
+0
-4
qa/qa/specs/features/browser_ui/4_verify/pipeline/trigger_child_pipeline_with_manual_spec.rb
...erify/pipeline/trigger_child_pipeline_with_manual_spec.rb
+1
-6
spec/controllers/projects/jobs_controller_spec.rb
spec/controllers/projects/jobs_controller_spec.rb
+0
-12
spec/models/ci/bridge_spec.rb
spec/models/ci/bridge_spec.rb
+0
-16
No files found.
app/controllers/projects/jobs_controller.rb
View file @
463d58cc
...
...
@@ -204,11 +204,7 @@ class Projects::JobsController < Projects::ApplicationController
end
def
find_job_as_processable
if
::
Gitlab
::
Ci
::
Features
.
manual_bridges_enabled?
(
project
)
@build
=
project
.
processables
.
find
(
params
[
:id
])
else
find_job_as_build
end
@build
=
project
.
processables
.
find
(
params
[
:id
])
end
def
build_path
(
build
)
...
...
app/models/ci/bridge.rb
View file @
463d58cc
...
...
@@ -132,14 +132,10 @@ module Ci
end
def
playable?
return
false
unless
::
Gitlab
::
Ci
::
Features
.
manual_bridges_enabled?
(
project
)
action?
&&
!
archived?
&&
manual?
end
def
action?
return
false
unless
::
Gitlab
::
Ci
::
Features
.
manual_bridges_enabled?
(
project
)
%w[manual]
.
include?
(
self
.
when
)
end
...
...
config/feature_flags/development/ci_manual_bridges.yml
deleted
100644 → 0
View file @
e38dc069
---
name
:
ci_manual_bridges
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44011
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/263412
milestone
:
'
13.5'
type
:
development
group
:
group::pipeline authoring
default_enabled
:
true
doc/ci/yaml/README.md
View file @
463d58cc
...
...
@@ -2271,9 +2271,6 @@ You can use [protected branches](../../user/project/protected_branches.md) to mo
In
[
GitLab 13.5
](
https://gitlab.com/gitlab-org/gitlab/-/issues/201938
)
and later, you
can use
`when:manual`
in the same job as
[
`trigger`
](
#trigger
)
. In GitLab 13.4 and
earlier, using them together causes the error
`jobs:#{job-name} when should be on_success, on_failure or always`
.
It is deployed behind the
`:ci_manual_bridges`
[
feature flag
](
../../user/feature_flags.md
)
, which is
**enabled by default**
.
[
GitLab administrators with access to the Rails console
](
../../administration/feature_flags.md
)
can opt to disable it.
##### Protecting manual jobs **(PREMIUM)**
...
...
@@ -3510,9 +3507,6 @@ hover over the downstream pipeline job.
In
[
GitLab 13.5
](
https://gitlab.com/gitlab-org/gitlab/-/issues/201938
)
and later, you
can use
[
`when:manual`
](
#whenmanual
)
in the same job as
`trigger`
. In GitLab 13.4 and
earlier, using them together causes the error
`jobs:#{job-name} when should be on_success, on_failure or always`
.
It is deployed behind the
`:ci_manual_bridges`
[
feature flag
](
../../user/feature_flags.md
)
, which is
**enabled by default**
.
[
GitLab administrators with access to the Rails console
](
../../administration/feature_flags.md
)
can opt to disable it.
#### Simple `trigger` syntax for multi-project pipelines
...
...
lib/gitlab/ci/features.rb
View file @
463d58cc
...
...
@@ -55,10 +55,6 @@ module Gitlab
::
Feature
.
enabled?
(
:ci_trace_log_invalid_chunks
,
project
,
type: :ops
,
default_enabled:
false
)
end
def
self
.
manual_bridges_enabled?
(
project
)
::
Feature
.
enabled?
(
:ci_manual_bridges
,
project
,
default_enabled:
true
)
end
def
self
.
auto_rollback_available?
(
project
)
::
Feature
.
enabled?
(
:cd_auto_rollback
,
project
)
&&
project
&
.
feature_available?
(
:auto_rollback
)
end
...
...
qa/qa/specs/features/browser_ui/4_verify/pipeline/trigger_child_pipeline_with_manual_spec.rb
View file @
463d58cc
...
...
@@ -3,11 +3,8 @@
require
'faker'
module
QA
RSpec
.
describe
'Verify'
,
:runner
,
:requires_admin
do
# [TODO]: Developer to remove :requires_admin once FF is removed in follow up issue
RSpec
.
describe
'Verify'
,
:runner
do
describe
"Trigger child pipeline with 'when:manual'"
do
let
(
:feature_flag
)
{
:ci_manual_bridges
}
# [TODO]: Developer to remove when feature flag is removed
let
(
:executor
)
{
"qa-runner-
#{
Faker
::
Alphanumeric
.
alphanumeric
(
8
)
}
"
}
let
(
:project
)
do
...
...
@@ -25,7 +22,6 @@ module QA
end
before
do
Runtime
::
Feature
.
enable
(
feature_flag
)
# [TODO]: Developer to remove when feature flag is removed
Flow
::
Login
.
sign_in
add_ci_files
project
.
visit!
...
...
@@ -33,7 +29,6 @@ module QA
end
after
do
Runtime
::
Feature
.
disable
(
feature_flag
)
# [TODO]: Developer to remove when feature flag is removed
runner
.
remove_via_api!
end
...
...
spec/controllers/projects/jobs_controller_spec.rb
View file @
463d58cc
...
...
@@ -806,18 +806,6 @@ RSpec.describe Projects::JobsController, :clean_gitlab_redis_shared_state do
expect
(
job
.
reload
).
to
be_pending
end
context
'when FF ci_manual_bridges is disabled'
do
before
do
stub_feature_flags
(
ci_manual_bridges:
false
)
end
it
'returns 404'
do
post_play
expect
(
response
).
to
have_gitlab_http_status
(
:not_found
)
end
end
end
end
...
...
spec/models/ci/bridge_spec.rb
View file @
463d58cc
...
...
@@ -330,14 +330,6 @@ RSpec.describe Ci::Bridge do
subject
{
build_stubbed
(
:ci_bridge
,
:manual
).
playable?
}
it
{
is_expected
.
to
be_truthy
}
context
'when FF ci_manual_bridges is disabled'
do
before
do
stub_feature_flags
(
ci_manual_bridges:
false
)
end
it
{
is_expected
.
to
be_falsey
}
end
end
context
'when build is not a manual action'
do
...
...
@@ -352,14 +344,6 @@ RSpec.describe Ci::Bridge do
subject
{
build_stubbed
(
:ci_bridge
,
:manual
).
action?
}
it
{
is_expected
.
to
be_truthy
}
context
'when FF ci_manual_bridges is disabled'
do
before
do
stub_feature_flags
(
ci_manual_bridges:
false
)
end
it
{
is_expected
.
to
be_falsey
}
end
end
context
'when build is not a manual action'
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