Merge branch 'sh-fix-issue-330124' into 'master'

All specs using :elastic should clear Redis shared state

See merge request gitlab-org/gitlab!64019

doc/development/testing_guide/best_practices.md

@@ -871,7 +871,8 @@ at the start and end of each context only. The [Elasticsearch DeleteByQuery API]
 is used to delete data in all indices in between examples to ensure a clean index.
 
 Note that Elasticsearch indexing uses [`Gitlab::Redis::SharedState`](../../../ee/development/redis.md#gitlabrediscachesharedstatequeues).
-Therefore, it is recommended to use `:clean_gitlab_redis_shared_state` in conjunction with the Elasticsearch traits.
+Therefore, the Elasticsearch traits dynamically use the `:clean_gitlab_redis_shared_state` trait.
+You do NOT need to add `:clean_gitlab_redis_shared_state` manually.
 
 Specs using Elasticsearch require that you:
 

ee/spec/support/elastic.rb

@@ -56,6 +56,10 @@ module Elastic
 end
 
 RSpec.configure do |config|
+  config.define_derived_metadata do |meta|
+    meta[:clean_gitlab_redis_cache] = true if meta[:elastic] || meta[:elastic_delete_by_query]
+  end
+
   config.around(:each, :elastic) do |example|
     helper = Elastic::TestHelpers.new
     helper.setup