Wrap changed code in feature flag

lib/gitlab/cache/ci/project_pipeline_status.rb

@@ -50,6 +50,8 @@ module Gitlab
         def load_status
           return if loaded?
 
+          return unless Gitlab::Ci::Features.pipeline_status_omit_commit_sha_in_cache_key?(project) || commit
+
           if has_cache?
             load_from_cache
           else
@@ -115,7 +117,11 @@ module Gitlab
         end
 
         def cache_key
+          if Gitlab::Ci::Features.pipeline_status_omit_commit_sha_in_cache_key?(project)
             "#{Gitlab::Redis::Cache::CACHE_NAMESPACE}:project:#{project.id}:pipeline_status"
+          else
+            "#{Gitlab::Redis::Cache::CACHE_NAMESPACE}:project:#{project.id}:pipeline_status:#{commit&.sha}"
+          end
         end
 
         def commit

lib/gitlab/ci/features.rb

@@ -34,6 +34,10 @@ module Gitlab
         ::Feature.enabled?(:ci_pipeline_latest, default_enabled: true)
       end
 
+      def self.pipeline_status_omit_commit_sha_in_cache_key?(project)
+        Feature.enabled?(:ci_pipeline_status_omit_commit_sha_in_cache_key, project)
+      end
+
       def self.release_generation_enabled?
         ::Feature.enabled?(:ci_release_generation)
       end

spec/lib/gitlab/cache/ci/project_pipeline_status_spec.rb

@@ -83,11 +83,27 @@ RSpec.describe Gitlab::Cache::Ci::ProjectPipelineStatus, :clean_gitlab_redis_cac
           expect(pipeline_status).not_to be_has_cache
         end
 
+        context 'ci_pipeline_status_omit_commit_sha_in_cache_key is enabled' do
+          before do
+            stub_feature_flags(ci_pipeline_status_omit_commit_sha_in_cache_key: project)
+          end
+
           it 'makes a Gitaly call' do
             expect { pipeline_status.load_status }.to change { Gitlab::GitalyClient.get_request_count }.by(1)
           end
         end
 
+        context 'ci_pipeline_status_omit_commit_sha_in_cache_key is disabled' do
+          before do
+            stub_feature_flags(ci_pipeline_status_omit_commit_sha_in_cache_key: false)
+          end
+
+          it 'makes a Gitaly calls' do
+            expect { pipeline_status.load_status }.to change { Gitlab::GitalyClient.get_request_count }.by(1)
+          end
+        end
+      end
+
       context 'cached' do
         before do
           described_class.load_in_batch_for_projects([project])
@@ -95,10 +111,26 @@ RSpec.describe Gitlab::Cache::Ci::ProjectPipelineStatus, :clean_gitlab_redis_cac
           expect(pipeline_status).to be_has_cache
         end
 
+        context 'ci_pipeline_status_omit_commit_sha_in_cache_key is enabled' do
+          before do
+            stub_feature_flags(ci_pipeline_status_omit_commit_sha_in_cache_key: project)
+          end
+
           it 'makes no Gitaly calls' do
             expect { pipeline_status.load_status }.to change { Gitlab::GitalyClient.get_request_count }.by(0)
           end
         end
+
+        context 'ci_pipeline_status_omit_commit_sha_in_cache_key is disabled' do
+          before do
+            stub_feature_flags(ci_pipeline_status_omit_commit_sha_in_cache_key: false)
+          end
+
+          it 'makes a Gitaly calls' do
+            expect { pipeline_status.load_status }.to change { Gitlab::GitalyClient.get_request_count }.by(1)
+          end
+        end
+      end
     end
 
     it 'loads the status from the cache when there is one' do