Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-all

spec/models/ci/build_trace_chunk_spec.rb

@@ -349,7 +349,7 @@ describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state do
     shared_examples_for 'deletes all build_trace_chunk and data in redis' do
       it do
         Gitlab::Redis::SharedState.with do |redis|
-          expect(redis.scan_each(match: "gitlab:ci:trace:?:chunks:?").to_a.size).to eq(3)
+          expect(redis.scan_each(match: "gitlab:ci:trace:*:chunks:*").to_a.size).to eq(3)
         end
 
         expect(described_class.count).to eq(3)
@@ -359,7 +359,7 @@ describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state do
         expect(described_class.count).to eq(0)
 
         Gitlab::Redis::SharedState.with do |redis|
-          expect(redis.scan_each(match: "gitlab:ci:trace:?:chunks:?").to_a.size).to eq(0)
+          expect(redis.scan_each(match: "gitlab:ci:trace:*:chunks:*").to_a.size).to eq(0)
         end
       end
     end