diff options
| -rw-r--r-- | app/models/ci/build_trace_chunk.rb | 2 | ||||
| -rw-r--r-- | spec/models/ci/build_trace_chunk_spec.rb | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/models/ci/build_trace_chunk.rb b/app/models/ci/build_trace_chunk.rb index 41c166aa804..5dc43c6e00f 100644 --- a/app/models/ci/build_trace_chunk.rb +++ b/app/models/ci/build_trace_chunk.rb @@ -21,7 +21,7 @@ module Ci def self.delayed_cleanup_blk ids = all.redis.pluck(:build_id, :chunk_index).map do |data| - "gitlab:ci:trace:#{data.first}:chunks:#{data.second}:data" + "gitlab:ci:trace:#{data.first}:chunks:#{data.second}" end puts "before cleanup: #{ids.count}" diff --git a/spec/models/ci/build_trace_chunk_spec.rb b/spec/models/ci/build_trace_chunk_spec.rb index cab5db9ca06..dff4e1aeff5 100644 --- a/spec/models/ci/build_trace_chunk_spec.rb +++ b/spec/models/ci/build_trace_chunk_spec.rb @@ -360,9 +360,11 @@ describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state do end end - context 'when build is destroyed' do + context 'when traces are archived' do let(:subject) do - project.builds.destroy_all + project.builds.each do |build| + build.success! + end end it_behaves_like 'deletes all build_trace_chunk and data in redis' |