diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-02-14 12:48:33 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-02-14 12:48:33 +0000 |
| commit | 215dff761e75c2b59c2a57c8bbe6deac77a8a766 (patch) | |
| tree | c38242e4a052582752729279bab86a57d0481282 /spec/factories | |
| parent | 44dc11f12e95e4968d51669d6d033f5ba795122e (diff) | |
| parent | 660a9d33d13f6e95d50b76028a22fcc437b86d0b (diff) | |
| download | gitlab-ce-215dff761e75c2b59c2a57c8bbe6deac77a8a766.tar.gz | |
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/factories')
| -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 |