summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-08-18 09:21:40 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-08-18 09:21:40 -0600
commitb5d0346a99401ec138ee411660b5c7ee28421f84 (patch)
treeda373c601bc635e5293876b659f587c87d09848f /db
parentc64e977d2e36caf108a1b8dd7348b2846e06b7f0 (diff)
parentac73de508e21af95b473bfafc2ca2543b234430d (diff)
downloadgitlab-ce-b5d0346a99401ec138ee411660b5c7ee28421f84.tar.gz
Merge branch 'master' into diff-line-comment-vuejs
Diffstat (limited to 'db')
-rw-r--r--db/fixtures/development/14_builds.rb9
1 files changed, 4 insertions, 5 deletions
diff --git a/db/fixtures/development/14_builds.rb b/db/fixtures/development/14_builds.rb
index 0d493fa1c3c..069d9dd6226 100644
--- a/db/fixtures/development/14_builds.rb
+++ b/db/fixtures/development/14_builds.rb
@@ -1,9 +1,8 @@
class Gitlab::Seeder::Builds
- STAGES = %w[build notify_build test notify_test deploy notify_deploy]
+ STAGES = %w[build test deploy notify]
BUILDS = [
{ name: 'build:linux', stage: 'build', status: :success },
{ name: 'build:osx', stage: 'build', status: :success },
- { name: 'slack post build', stage: 'notify_build', status: :success },
{ name: 'rspec:linux', stage: 'test', status: :success },
{ name: 'rspec:windows', stage: 'test', status: :success },
{ name: 'rspec:windows', stage: 'test', status: :success },
@@ -12,9 +11,9 @@ class Gitlab::Seeder::Builds
{ name: 'spinach:osx', stage: 'test', status: :canceled },
{ name: 'cucumber:linux', stage: 'test', status: :running },
{ name: 'cucumber:osx', stage: 'test', status: :failed },
- { name: 'slack post test', stage: 'notify_test', status: :success },
{ name: 'staging', stage: 'deploy', environment: 'staging', status: :success },
- { name: 'production', stage: 'deploy', environment: 'production', when: 'manual', status: :success },
+ { name: 'production', stage: 'deploy', environment: 'production', when: 'manual', status: :skipped },
+ { name: 'slack', stage: 'notify', when: 'manual', status: :created },
]
def initialize(project)
@@ -25,7 +24,7 @@ class Gitlab::Seeder::Builds
pipelines.each do |pipeline|
begin
BUILDS.each { |opts| build_create!(pipeline, opts) }
- commit_status_create!(pipeline, name: 'jenkins', status: :success)
+ commit_status_create!(pipeline, name: 'jenkins', stage: 'test', status: :success)
print '.'
rescue ActiveRecord::RecordInvalid
print 'F'