Commit 90becf96 authored by Shinya Maeda's avatar Shinya Maeda

Squashed commit of the following:

commit b4e71d4f5a1334a27c179d086bfea57c707de4ef
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Wed Aug 8 20:07:09 2018 +0900

    Add changelog

commit 50bc02ca6cfcf9c8d18d5c832a00c0f9f778d475
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Wed Aug 8 20:05:17 2018 +0900

    Fix fixture path

commit 15779300f98e00277db0e66fcfd865f603b45234
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Wed Aug 8 19:59:14 2018 +0900

    Revert leftovers

commit e26c0ce6b1fc490c1ad8c53fd8da5b95f8ef27ed
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Wed Aug 8 19:57:30 2018 +0900

    Revert quick actions

commit 9e257650ad8683c5628fd717fb21a8767bfca0fc
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Wed Aug 8 19:28:40 2018 +0900

    Add changelog

commit 473edcf4e60200c5ec9f6b92907d4badcf9c6a94
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Wed Aug 8 19:27:25 2018 +0900

    Fix specs

commit fa2d4f76235c8aa19de9712288f5c225c47ea5f0
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Wed Aug 8 19:20:21 2018 +0900

    Fix fixture

commit ee3df6595e4693c4ff11b8799aa15fc2078b7843
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Wed Aug 8 19:14:12 2018 +0900

    Clean up quick action scripts

commit 2398de2711f196c2a3fdedbd52b878489e7aa01e
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Wed Aug 8 18:15:21 2018 +0900

    Add quick action tasks

commit b0dbc47e2c29419133c1a24ed6922a68584a3e28
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Wed Aug 8 15:33:24 2018 +0900

    Simplify fixtures

commit 693a95f2edb400a3db0e6e6f3021777f849f9400
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Tue Aug 7 13:11:07 2018 +0900

    Support corrupted fixtures

commit d4e44eb329193cd68c964424f5343d3863802751
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Thu Aug 2 19:07:46 2018 +0900

    bring back debaggable fixtures

commit 466d3ffefac20d0f3eec350ea7231e0e403da90d
Author: Shinya Maeda <shinya@gitlab.com>
Date:   Thu Aug 2 15:25:30 2018 +0900

    Revert "Decouple fixture seeds change"

    This reverts commit 30626cf8.
parent b507d93a
---
title: Fix pipeline fixture seeder
merge_request: 21088
author:
type: fixed
...@@ -41,7 +41,7 @@ class Gitlab::Seeder::Pipelines ...@@ -41,7 +41,7 @@ class Gitlab::Seeder::Pipelines
when: 'manual', status: :skipped }, when: 'manual', status: :skipped },
# notify stage # notify stage
{ name: 'slack', stage: 'notify', when: 'manual', status: :created }, { name: 'slack', stage: 'notify', when: 'manual', status: :success },
] ]
EXTERNAL_JOBS = [ EXTERNAL_JOBS = [
{ name: 'jenkins', stage: 'test', status: :success, { name: 'jenkins', stage: 'test', status: :success,
...@@ -54,18 +54,12 @@ class Gitlab::Seeder::Pipelines ...@@ -54,18 +54,12 @@ class Gitlab::Seeder::Pipelines
def seed! def seed!
pipelines.each do |pipeline| pipelines.each do |pipeline|
begin
BUILDS.each { |opts| build_create!(pipeline, opts) } BUILDS.each { |opts| build_create!(pipeline, opts) }
EXTERNAL_JOBS.each { |opts| commit_status_create!(pipeline, opts) } EXTERNAL_JOBS.each { |opts| commit_status_create!(pipeline, opts) }
print '.'
rescue ActiveRecord::RecordInvalid
print 'F'
ensure
pipeline.update_duration pipeline.update_duration
pipeline.update_status pipeline.update_status
end end
end end
end
private private
...@@ -87,7 +81,9 @@ class Gitlab::Seeder::Pipelines ...@@ -87,7 +81,9 @@ class Gitlab::Seeder::Pipelines
branch = merge_request.source_branch branch = merge_request.source_branch
merge_request.commits.last(4).map do |commit| merge_request.commits.last(4).map do |commit|
create_pipeline!(project, branch, commit) create_pipeline!(project, branch, commit).tap do |pipeline|
merge_request.update!(head_pipeline_id: pipeline.id)
end
end end
end end
...@@ -98,7 +94,7 @@ class Gitlab::Seeder::Pipelines ...@@ -98,7 +94,7 @@ class Gitlab::Seeder::Pipelines
def create_pipeline!(project, ref, commit) def create_pipeline!(project, ref, commit)
project.pipelines.create(sha: commit.id, ref: ref, source: :push) project.pipelines.create!(sha: commit.id, ref: ref, source: :push)
end end
def build_create!(pipeline, opts = {}) def build_create!(pipeline, opts = {})
...@@ -111,24 +107,39 @@ class Gitlab::Seeder::Pipelines ...@@ -111,24 +107,39 @@ class Gitlab::Seeder::Pipelines
# block directly to `Ci::Build#create!`. # block directly to `Ci::Build#create!`.
setup_artifacts(build) setup_artifacts(build)
setup_test_reports(build)
setup_build_log(build) setup_build_log(build)
build.project.environments. build.project.environments.
find_or_create_by(name: build.expanded_environment_name) find_or_create_by(name: build.expanded_environment_name)
build.save build.save!
end end
end end
def setup_artifacts(build) def setup_artifacts(build)
return unless %w[build test].include?(build.stage) return unless build.stage == "build"
artifacts_cache_file(artifacts_archive_path) do |file| artifacts_cache_file(artifacts_archive_path) do |file|
build.job_artifacts.build(project: build.project, file_type: :archive, file: file) build.job_artifacts.build(project: build.project, file_type: :archive, file_format: :zip, file: file)
end end
artifacts_cache_file(artifacts_metadata_path) do |file| artifacts_cache_file(artifacts_metadata_path) do |file|
build.job_artifacts.build(project: build.project, file_type: :metadata, file: file) build.job_artifacts.build(project: build.project, file_type: :metadata, file_format: :gzip, file: file)
end
end
def setup_test_reports(build)
return unless build.stage == "test" && build.name == "rspec:osx"
if build.ref == build.project.default_branch
artifacts_cache_file(test_reports_pass_path) do |file|
build.job_artifacts.build(project: build.project, file_type: :junit, file_format: :gzip, file: file)
end
else
artifacts_cache_file(test_reports_failed_path) do |file|
build.job_artifacts.build(project: build.project, file_type: :junit, file_format: :gzip, file: file)
end
end end
end end
...@@ -171,13 +182,21 @@ class Gitlab::Seeder::Pipelines ...@@ -171,13 +182,21 @@ class Gitlab::Seeder::Pipelines
Rails.root + 'spec/fixtures/ci_build_artifacts_metadata.gz' Rails.root + 'spec/fixtures/ci_build_artifacts_metadata.gz'
end end
def artifacts_cache_file(file_path) def test_reports_pass_path
cache_path = file_path.to_s.gsub('ci_', "p#{@project.id}_") Rails.root + 'spec/fixtures/junit/junit_ant.xml.gz'
end
FileUtils.copy(file_path, cache_path) def test_reports_failed_path
File.open(cache_path) do |file| Rails.root + 'spec/fixtures/junit/junit.xml.gz'
yield file
end end
def artifacts_cache_file(file_path)
file = Tempfile.new("artifacts")
file.close
FileUtils.copy(file_path, file.path)
yield(UploadedFile.new(file.path, filename: File.basename(file_path)))
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment