summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThong Kuah <tkuah@gitlab.com>2019-09-03 10:04:12 +0000
committerThong Kuah <tkuah@gitlab.com>2019-09-03 10:04:12 +0000
commitf15e3efba0e0523575ce61bd80396abda94b8cec (patch)
treed20d69025816b1cd95e24a92058b1c742de7641e
parent8c5d3fa63ed04fe6010a23ed0ffb8b07d0f091e3 (diff)
parentd4adad0c5e916f56717eaf9ed682fc542f3188dc (diff)
downloadgitlab-ce-f15e3efba0e0523575ce61bd80396abda94b8cec.tar.gz
Merge branch 'fix-cycle-analytics-seeds' into 'master'
Fix cycle analytics seed script See merge request gitlab-org/gitlab-ce!32536
-rw-r--r--db/fixtures/development/17_cycle_analytics.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/db/fixtures/development/17_cycle_analytics.rb b/db/fixtures/development/17_cycle_analytics.rb
index 78ceb74da65..9d293f425e6 100644
--- a/db/fixtures/development/17_cycle_analytics.rb
+++ b/db/fixtures/development/17_cycle_analytics.rb
@@ -18,6 +18,7 @@ class Gitlab::Seeder::CycleAnalytics
# Milestones / Labels
Timecop.travel 5.days.from_now
+
if index.even?
issue_metrics.first_associated_with_milestone_at = rand(6..12).hours.from_now
else
@@ -146,7 +147,7 @@ class Gitlab::Seeder::CycleAnalytics
commit_sha = issue.project.repository.create_file(@user, filename, "content", message: "Commit for #{issue.to_reference}", branch_name: branch_name)
issue.project.repository.commit(commit_sha)
- Git::BranchPushService.new(
+ ::Git::BranchPushService.new(
issue.project,
@user,
oldrev: issue.project.repository.commit("master").sha,
@@ -182,7 +183,8 @@ class Gitlab::Seeder::CycleAnalytics
ref: "refs/heads/#{merge_request.source_branch}")
pipeline = service.execute(:push, ignore_skip_ci: true, save_on_errors: false)
- pipeline.builds.map(&:run!)
+ pipeline.builds.each(&:enqueue) # make sure all pipelines in pending state
+ pipeline.builds.each(&:run!)
pipeline.update_status
end
end