Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42

2 files changed, 8 insertions, 18 deletions

diff --git a/spec/factories/ci/runner_versions.rb b/spec/factories/ci/runner_versions.rb
new file mode 100644
index 00000000000..69127aa6e54
--- /dev/null
+++ b/spec/factories/ci/runner_versions.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :ci_runner_version, class: 'Ci::RunnerVersion' do
+    sequence(:version) { |n| "1.0.#{n}" }
+  end
+end
diff --git a/spec/factories/ci/stages.rb b/spec/factories/ci/stages.rb
index 4751c04584e..41297b01f92 100644
--- a/spec/factories/ci/stages.rb
+++ b/spec/factories/ci/stages.rb
@@ -1,24 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :ci_stage, class: 'Ci::LegacyStage' do
-    skip_create
-
-    transient do
-      name { 'test' }
-      status { nil }
-      warnings { nil }
-      pipeline factory: :ci_empty_pipeline
-    end
-
-    initialize_with do
-      Ci::LegacyStage.new(pipeline, name: name,
-        status: status,
-        warnings: warnings)
-    end
-  end
-
-  factory :ci_stage_entity, class: 'Ci::Stage' do
+  factory :ci_stage, class: 'Ci::Stage' do
     project factory: :project
     pipeline factory: :ci_empty_pipeline