Revert "Merge branch 'ka/skip-finalized-bbm-tests' into 'master'"

This reverts merge request !182048

doc/development/pipelines/_index.md

@@ -645,8 +645,7 @@ fail.
 #### Troubleshooting `rspec:undercoverage` failures
 
 The `rspec:undercoverage` job has [known bugs](https://gitlab.com/groups/gitlab-org/-/epics/8254)
-that can cause false positive failures. Such false positive failures may also happen if you are updating database migration that is too old,
-or background migration that is already finalized.
+that can cause false positive failures. Such false positive failures may also happen if you are updating database migration that is too old.
 You can test coverage locally to determine if it's safe to apply `pipeline:skip-undercoverage`. For example, using `<spec>` as the name of the
 test causing the failure:
 

spec/support/helpers/migrations_helpers.rb

@@ -9,26 +9,21 @@ module MigrationsHelpers
 ERROR
 
   def migration_out_of_test_window?(migration_class)
+    # Skip unless database migration (e.g background migration)
+    return false unless migration_class < Gitlab::Database::Migration[1.0]
+
     return false if ENV.fetch('RUN_ALL_MIGRATION_TESTS', false)
 
-    if migration_class < Gitlab::Database::Migration[1.0]
-      # Skip unless database migration older than min_schema_gitlab_version
-      milestone = migration_class.try(:milestone)
+    milestone = migration_class.try(:milestone)
 
-      # Missing milestone indicates that the migration is pre-16.7,
-      # which is old enough not to execute its tests
-      return true unless milestone
+    # Missing milestone indicates that the migration is pre-16.7,
+    # which is old enough not to execute its tests
+    return true unless milestone
 
-      migration_milestone = Gitlab::VersionInfo.parse_from_milestone(milestone)
-      min_milestone = Gitlab::Database.min_schema_gitlab_version
+    migration_milestone = Gitlab::VersionInfo.parse_from_milestone(milestone)
+    min_milestone = Gitlab::Database.min_schema_gitlab_version
 
-      migration_milestone < min_milestone
-    elsif migration_class < Gitlab::BackgroundMigration::BatchedMigrationJob
-      # Skip batched background migrations that are already finalized
-      finalized_by_version.present?
-    else
-      false
-    end
+    migration_milestone < min_milestone
   end
 
   def active_record_base(database: nil)