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
d4d21ef2
Commit
d4d21ef2
authored
Jan 29, 2021
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove ci_live_trace_use_fog_attributes feature flag
Closes
https://gitlab.com/gitlab-org/gitlab/-/issues/285079
parent
3cce9517
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
38 deletions
+6
-38
app/models/ci/build_trace_chunks/fog.rb
app/models/ci/build_trace_chunks/fog.rb
+1
-9
changelogs/unreleased/sh-disable-ci-live-trace-ff.yml
changelogs/unreleased/sh-disable-ci-live-trace-ff.yml
+5
-0
config/feature_flags/development/ci_live_trace_use_fog_attributes.yml
...re_flags/development/ci_live_trace_use_fog_attributes.yml
+0
-8
spec/models/ci/build_trace_chunks/fog_spec.rb
spec/models/ci/build_trace_chunks/fog_spec.rb
+0
-21
No files found.
app/models/ci/build_trace_chunks/fog.rb
View file @
d4d21ef2
...
...
@@ -14,15 +14,7 @@ module Ci
end
def
set_data
(
model
,
new_data
)
if
Feature
.
enabled?
(
:ci_live_trace_use_fog_attributes
,
default_enabled:
true
)
files
.
create
(
create_attributes
(
model
,
new_data
))
else
# TODO: Support AWS S3 server side encryption
files
.
create
({
key:
key
(
model
),
body:
new_data
})
end
files
.
create
(
create_attributes
(
model
,
new_data
))
end
def
append_data
(
model
,
new_data
,
offset
)
...
...
changelogs/unreleased/sh-disable-ci-live-trace-ff.yml
0 → 100644
View file @
d4d21ef2
---
title
:
Remove ci_live_trace_use_fog_attributes feature flag
merge_request
:
52939
author
:
type
:
changed
config/feature_flags/development/ci_live_trace_use_fog_attributes.yml
deleted
100644 → 0
View file @
3cce9517
---
name
:
ci_live_trace_use_fog_attributes
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47536
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/285079
milestone
:
'
13.6'
type
:
development
group
:
group::testing
default_enabled
:
true
spec/models/ci/build_trace_chunks/fog_spec.rb
View file @
d4d21ef2
...
...
@@ -98,27 +98,6 @@ RSpec.describe Ci::BuildTraceChunks::Fog do
expect
(
data_store
.
data
(
model
)).
to
eq
new_data
end
context
'when ci_live_trace_use_fog_attributes flag is disabled'
do
before
do
stub_feature_flags
(
ci_live_trace_use_fog_attributes:
false
)
end
it
'does not pass along Fog attributes'
do
expect_next_instance_of
(
Fog
::
AWS
::
Storage
::
Files
)
do
|
files
|
expect
(
files
).
to
receive
(
:create
).
with
(
key:
anything
,
body:
new_data
).
and_call_original
end
expect
(
data_store
.
data
(
model
)).
to
be_nil
data_store
.
set_data
(
model
,
new_data
)
expect
(
data_store
.
data
(
model
)).
to
eq
new_data
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