diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-02-14 15:48:33 +0300 |
|---|---|---|
| committer | Mark Fletcher <mark@gitlab.com> | 2018-02-15 21:31:51 +0300 |
| commit | 9f91539d1298361cb2a18934929db9024f4d1480 (patch) | |
| tree | cc9d9f00dda8d806e3f76a40dcb7781e72323a0b /spec | |
| parent | 49377193da365020130ce17d1117d8094a877a3e (diff) | |
Merge branch 'expired-ci-artifacts' into 'master'
Change SQL for expired artifacts to use new ci_job_artifacts.expire_at
See merge request gitlab-org/gitlab-ce!16578
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/factories/ci/builds.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb index 6ba599cdf83..f6ba3a581ca 100644 --- a/spec/factories/ci/builds.rb +++ b/spec/factories/ci/builds.rb @@ -180,8 +180,8 @@ FactoryBot.define do trait :artifacts do after(:create) do |build| - create(:ci_job_artifact, :archive, job: build) - create(:ci_job_artifact, :metadata, job: 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) build.reload end end |