Add latest changes from gitlab-org/gitlab@master

2 files changed, 14 insertions, 0 deletions

diff --git a/spec/factories/ci/job_artifacts.rb b/spec/factories/ci/job_artifacts.rb
index 296215abfa0..e0942bf0ac3 100644
--- a/spec/factories/ci/job_artifacts.rb
+++ b/spec/factories/ci/job_artifacts.rb
@@ -149,6 +149,16 @@ FactoryBot.define do
       end
     end
 
+    trait :dotenv do
+      file_type { :dotenv }
+      file_format { :gzip }
+
+      after(:build) do |artifact, evaluator|
+        artifact.file = fixture_file_upload(
+          Rails.root.join('spec/fixtures/build.env.gz'), 'application/x-gzip')
+      end
+    end
+
     trait :correct_checksum do
       after(:build) do |artifact, evaluator|
         artifact.file_sha256 = Digest::SHA256.file(artifact.file.path).hexdigest
diff --git a/spec/factories/ci/job_variables.rb b/spec/factories/ci/job_variables.rb
index 472a89d3bef..ae2b89ad98d 100644
--- a/spec/factories/ci/job_variables.rb
+++ b/spec/factories/ci/job_variables.rb
@@ -6,5 +6,9 @@ FactoryBot.define do
     value { 'VARIABLE_VALUE' }
 
     job factory: :ci_build
+
+    trait :dotenv_source do
+      source { :dotenv }
+    end
   end
 end