diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-04-17 06:07:56 +0300 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-04-17 06:07:56 +0300 |
| commit | 23634e45678b13954fc00fd4e57425ff5cb559aa (patch) | |
| tree | 636a39d3306c664d25df413f8e6c329fcf3a8fea /spec/factories/ci | |
| parent | 76485cbf8ba555c929fd2f54ca2051a382760f20 (diff) | |
| parent | c39ad568e469b288a510c03b1aebefd78d8a9ee5 (diff) | |
Merge branch 'master' into live-trace-v2
Diffstat (limited to 'spec/factories/ci')
| -rw-r--r-- | spec/factories/ci/builds.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb index fdacbe6c3f1..e1fafa71d5c 100644 --- a/spec/factories/ci/builds.rb +++ b/spec/factories/ci/builds.rb @@ -62,7 +62,6 @@ FactoryBot.define do end trait :pending do - queued_at 'Di 29. Okt 09:50:59 CET 2013' status 'pending' end @@ -207,7 +206,7 @@ FactoryBot.define do options do { image: { name: 'ruby:2.1', entrypoint: '/bin/sh' }, - services: ['postgres', { name: 'docker:dind', entrypoint: '/bin/sh', command: 'sleep 30', alias: 'docker' }], + services: ['postgres', { name: 'docker:stable-dind', entrypoint: '/bin/sh', command: 'sleep 30', alias: 'docker' }], after_script: %w(ls date), artifacts: { name: 'artifacts_file', |