summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsh McKenzie <amckenzie@gitlab.com>2019-08-26 01:52:08 +0000
committerAsh McKenzie <amckenzie@gitlab.com>2019-08-26 01:52:08 +0000
commit257230e98643d319e59b3c15d928c4309253e93c (patch)
tree9db1ef8ce50de547f389e2652302416c9f014c6b
parentfc08d48cf0a596dc151cb7bc7ab0f7d2721f3333 (diff)
parentb70aabf9b394448ab1056950a3547e08531ea01e (diff)
downloadgitlab-ce-257230e98643d319e59b3c15d928c4309253e93c.tar.gz
Merge branch 'ee-10586-geo-object-storage-replication' into 'master'
Backport expired job artifact trait See merge request gitlab-org/gitlab-ce!32179
-rw-r--r--spec/factories/ci/job_artifacts.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/factories/ci/job_artifacts.rb b/spec/factories/ci/job_artifacts.rb
index 2d68a8e9fe3..6f553cadfa3 100644
--- a/spec/factories/ci/job_artifacts.rb
+++ b/spec/factories/ci/job_artifacts.rb
@@ -8,6 +8,10 @@ FactoryBot.define do
file_type :archive
file_format :zip
+ trait :expired do
+ expire_at { Date.yesterday }
+ end
+
trait :remote_store do
file_store JobArtifactUploader::Store::REMOTE
end