Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

4 files changed, 27 insertions, 3 deletions

diff --git a/spec/db/development/add_security_training_providers_spec.rb b/spec/db/development/add_security_training_providers_spec.rb
new file mode 100644
index 00000000000..276fa690898
--- /dev/null
+++ b/spec/db/development/add_security_training_providers_spec.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'Create security training providers in development' do
+  subject { load Rails.root.join('db', 'fixtures', 'development', '044_add_security_training_providers.rb') }
+
+  it_behaves_like 'security training providers importer'
+end
diff --git a/spec/db/migration_spec.rb b/spec/db/migration_spec.rb
index 7987c78b423..7751bfd989d 100644
--- a/spec/db/migration_spec.rb
+++ b/spec/db/migration_spec.rb
@@ -8,10 +8,10 @@ RSpec.describe 'Migrations Validation' do
   # The range describes the timestamps that given migration helper can be used
   let(:all_migration_classes) do
     {
-      2022_01_26_21_06_58..                    => Gitlab::Database::Migration[2.0],
+      2022_01_26_21_06_58.. => Gitlab::Database::Migration[2.0],
       2021_09_01_15_33_24..2022_04_25_12_06_03 => Gitlab::Database::Migration[1.0],
       2021_05_31_05_39_16..2021_09_01_15_33_24 => ActiveRecord::Migration[6.1],
-                         ..2021_05_31_05_39_16 => ActiveRecord::Migration[6.0]
+      ..2021_05_31_05_39_16 => ActiveRecord::Migration[6.0]
     }
   end
 
diff --git a/spec/db/production/add_security_training_providers_spec.rb b/spec/db/production/add_security_training_providers_spec.rb
new file mode 100644
index 00000000000..50d0653e7a2
--- /dev/null
+++ b/spec/db/production/add_security_training_providers_spec.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'Create security training providers in production' do
+  subject { load Rails.root.join('db', 'fixtures', 'production', '004_add_security_training_providers.rb') }
+
+  it_behaves_like 'security training providers importer'
+end
diff --git a/spec/db/schema_spec.rb b/spec/db/schema_spec.rb
index bd13f86034a..4aeafed5712 100644
--- a/spec/db/schema_spec.rb
+++ b/spec/db/schema_spec.rb
@@ -31,9 +31,14 @@ RSpec.describe 'Database schema' do
     boards: %w[milestone_id iteration_id],
     chat_names: %w[chat_id team_id user_id],
     chat_teams: %w[team_id],
-    ci_builds: %w[erased_by_id trigger_request_id],
+    ci_builds: %w[erased_by_id trigger_request_id partition_id],
+    ci_builds_metadata: %w[partition_id],
+    ci_job_artifacts: %w[partition_id],
     ci_namespace_monthly_usages: %w[namespace_id],
+    ci_pipeline_variables: %w[partition_id],
+    ci_pipelines: %w[partition_id],
     ci_runner_projects: %w[runner_id],
+    ci_stages: %w[partition_id],
     ci_trigger_requests: %w[commit_id],
     cluster_providers_aws: %w[security_group_id vpc_id access_key_id],
     cluster_providers_gcp: %w[gcp_project_id operation_id],
@@ -50,6 +55,7 @@ RSpec.describe 'Database schema' do
     geo_node_statuses: %w[last_event_id cursor_last_event_id],
     geo_nodes: %w[oauth_application_id],
     geo_repository_deleted_events: %w[project_id],
+    ghost_user_migrations: %w[initiator_user_id],
     gitlab_subscription_histories: %w[gitlab_subscription_id hosted_plan_id namespace_id],
     identities: %w[user_id],
     import_failures: %w[project_id],