Add latest changes from gitlab-org/gitlab@master

db/docs/batched_background_migrations/update_sbom_components_name_based_on_pep503.yml

@@ -5,4 +5,5 @@ feature_category: software_composition_analysis
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/145700
 milestone: '16.11'
 queued_migration_version: 20240223130548
-
+finalize_after: '2024-03-24'
+finalized_by: 20240828162042

db/post_migrate/20240828162042_finalize_pep_503_sbom_component_normalization_migrations.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class FinalizePep503SbomComponentNormalizationMigrations < Gitlab::Database::Migration[2.2]
+  restrict_gitlab_migration gitlab_schema: :gitlab_main
+
+  milestone '17.4'
+
+  MIGRATION_NAME = 'UpdateSbomComponentsNameBasedOnPep503'
+
+  disable_ddl_transaction!
+
+  def up
+    ensure_batched_background_migration_is_finished(
+      job_class_name: MIGRATION_NAME,
+      table_name: :sbom_components,
+      column_name: :id,
+      job_arguments: [],
+      finalize: true
+    )
+  end
+
+  def down
+    # no-op
+  end
+end

db/schema_migrations/20240828162042

@@ -0,0 +1 @@
+ddc2a53cf682e7dcbe636319acf27bddc793a754d1a9bb18e97496761993a89d

spec/lib/gitlab/background_migration/update_sbom_components_name_based_on_pep503_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::BackgroundMigration::UpdateSbomComponentsNameBasedOnPep503, feature_category: :software_composition_analysis do
+RSpec.describe Gitlab::BackgroundMigration::UpdateSbomComponentsNameBasedOnPep503, schema: 20240828162042, feature_category: :software_composition_analysis do
   let(:components) { table(:sbom_components) }
 
   before do