3 files changed, 27 insertions, 3 deletions
diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index 15a88955e05..78398fd7f20 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -421,9 +421,17 @@ FactoryBot.define do
     end
 
     trait :artifacts do
-      after(:create) do |build|
-        create(:ci_job_artifact, :archive, job: build, expire_at: build.artifacts_expire_at)
-        create(:ci_job_artifact, :metadata, job: build, expire_at: build.artifacts_expire_at)
+      after(:create) do |build, evaluator|
+        create(:ci_job_artifact, :archive, :public, job: build, expire_at: build.artifacts_expire_at)
+        create(:ci_job_artifact, :metadata, :public, job: build, expire_at: build.artifacts_expire_at)
+        build.reload
+      end
+    end
+
+    trait :private_artifacts do
+      after(:create) do |build, evaluator|
+        create(:ci_job_artifact, :archive, :private, job: build, expire_at: build.artifacts_expire_at)
+        create(:ci_job_artifact, :metadata, :private, job: build, expire_at: build.artifacts_expire_at)
         build.reload
       end
     end
diff --git a/spec/factories/ci/job_artifacts.rb b/spec/factories/ci/job_artifacts.rb
index 7569e832c60..5e049e0375b 100644
--- a/spec/factories/ci/job_artifacts.rb
+++ b/spec/factories/ci/job_artifacts.rb
@@ -174,6 +174,14 @@ FactoryBot.define do
       end
     end
 
+    trait :private do
+      accessibility { 'private' }
+    end
+
+    trait :public do
+      accessibility { 'public' }
+    end
+
     trait :accessibility do
       file_type { :accessibility }
       file_format { :raw }
diff --git a/spec/factories/ci/runner_machines.rb b/spec/factories/ci/runner_machines.rb
new file mode 100644
index 00000000000..09bf5d0844e
--- /dev/null
+++ b/spec/factories/ci/runner_machines.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :ci_runner_machine, class: 'Ci::RunnerMachine' do
+    runner factory: :ci_runner
+    machine_xid { "r_#{SecureRandom.hex.slice(0, 10)}" }
+  end
+end