Merge branch '370628-feature-flag-rollout-of-prevent_outdated_deployment_jobs' into 'master'

Enable `prevent_rollback_deployment?` permanently

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/100983



Merged-by: Shinya Maeda <shinya@gitlab.com>
Approved-by: Alishan Ladhani <aladhani@gitlab.com>
Approved-by: Shinya Maeda <shinya@gitlab.com>
Co-authored-by: Allen Cook <acook@gitlab.com>

app/models/ci/build.rb

@@ -455,8 +455,7 @@ def waiting_for_deployment_approval?
 
     def prevent_rollback_deployment?
       strong_memoize(:prevent_rollback_deployment) do
-        Feature.enabled?(:prevent_outdated_deployment_jobs, project) &&
-          starts_environment? &&
+        starts_environment? &&
           project.ci_forward_deployment_enabled? &&
           deployment&.older_than_last_successful_deployment?
       end

app/models/deployment.rb

@@ -105,6 +105,7 @@ class Deployment < ApplicationRecord
 
     after_transition any => :running do |deployment|
       next unless deployment.project.ci_forward_deployment_enabled?
+      next if Feature.enabled?(:prevent_outdated_deployment_jobs, deployment.project)
 
       deployment.run_after_commit do
         Deployments::DropOlderDeploymentsWorker.perform_async(id)

app/services/ci/process_build_service.rb

@@ -25,6 +25,8 @@ def process(build)
     end
 
     def enqueue(build)
+      return build.drop!(:failed_outdated_deployment_job) if build.prevent_rollback_deployment?
+
       build.enqueue
     end
 

ee/app/services/ee/ci/process_build_service.rb

@@ -23,8 +23,6 @@ def enqueue(build)
           return build.drop!(:protected_environment_failure)
         end
 
-        return build.drop!(:failed_outdated_deployment_job) if build.prevent_rollback_deployment?
-
         super
       end
     end

spec/models/ci/build_spec.rb

@@ -632,15 +632,6 @@
       it { expect(subject).to be_falsey }
     end
 
-    context 'when prevent_outdated_deployment_jobs FF is disabled' do
-      before do
-        stub_feature_flags(prevent_outdated_deployment_jobs: false)
-        expect(build.deployment).not_to receive(:rollback?)
-      end
-
-      it { expect(subject).to be_falsey }
-    end
-
     context 'when build can prevent rollback deployment' do
       before do
         expect(build.deployment).to receive(:older_than_last_successful_deployment?).and_return(true)

spec/models/deployment_spec.rb

@@ -171,11 +171,22 @@
       end
 
       it 'executes Deployments::DropOlderDeploymentsWorker asynchronously' do
+        stub_feature_flags(prevent_outdated_deployment_jobs: false)
+
         expect(Deployments::DropOlderDeploymentsWorker)
             .to receive(:perform_async).once.with(deployment.id)
 
         deployment.run!
       end
+
+      it 'does not execute Deployments::DropOlderDeploymentsWorker when FF enabled' do
+        stub_feature_flags(prevent_outdated_deployment_jobs: true)
+
+        expect(Deployments::DropOlderDeploymentsWorker)
+          .not_to receive(:perform_async).with(deployment.id)
+
+        deployment.run!
+      end
     end
 
     context 'when deployment succeeded' do