Remove unused projects.ci_id column
And remove Gitlab::Ci::Trace#deprecated_path as it relies on ci_id Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
a8347c22d0
commit
ee7d2c1b2f
|
@ -56,6 +56,7 @@ class Project < ApplicationRecord
|
|||
VALID_MIRROR_PROTOCOLS = %w(http https ssh git).freeze
|
||||
|
||||
ignore_column :import_status, :import_jid, :import_error
|
||||
ignore_column :ci_id
|
||||
|
||||
cache_markdown_field :description, pipeline: :description
|
||||
|
||||
|
|
|
@ -0,0 +1,28 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
# See http://doc.gitlab.com/ce/development/migration_style_guide.html
|
||||
# for more information on how to write migrations for GitLab.
|
||||
|
||||
class DropProjectsCiId < ActiveRecord::Migration[5.1]
|
||||
include Gitlab::Database::MigrationHelpers
|
||||
|
||||
# Set this constant to true if this migration requires downtime.
|
||||
DOWNTIME = false
|
||||
|
||||
disable_ddl_transaction!
|
||||
|
||||
def up
|
||||
if index_exists?(:projects, :ci_id)
|
||||
remove_concurrent_index :projects, :ci_id
|
||||
end
|
||||
|
||||
if column_exists?(:projects, :ci_id)
|
||||
remove_column :projects, :ci_id
|
||||
end
|
||||
end
|
||||
|
||||
def down
|
||||
add_column :projects, :ci_id, :integer
|
||||
add_concurrent_index :projects, :ci_id
|
||||
end
|
||||
end
|
|
@ -1737,7 +1737,6 @@ ActiveRecord::Schema.define(version: 20190426180107) do
|
|||
t.string "import_type"
|
||||
t.string "import_source"
|
||||
t.text "import_error"
|
||||
t.integer "ci_id"
|
||||
t.boolean "shared_runners_enabled", default: true, null: false
|
||||
t.string "runners_token"
|
||||
t.string "build_coverage_regex"
|
||||
|
@ -1776,7 +1775,6 @@ ActiveRecord::Schema.define(version: 20190426180107) do
|
|||
t.string "bfg_object_map"
|
||||
t.boolean "detected_repository_languages"
|
||||
t.string "external_authorization_classification_label"
|
||||
t.index ["ci_id"], name: "index_projects_on_ci_id", using: :btree
|
||||
t.index ["created_at"], name: "index_projects_on_created_at", using: :btree
|
||||
t.index ["creator_id"], name: "index_projects_on_creator_id", using: :btree
|
||||
t.index ["description"], name: "index_projects_on_description_trigram", using: :gin, opclasses: {"description"=>"gin_trgm_ops"}
|
||||
|
|
|
@ -209,10 +209,7 @@ module Gitlab
|
|||
end
|
||||
|
||||
def paths
|
||||
[
|
||||
default_path,
|
||||
deprecated_path
|
||||
].compact
|
||||
[default_path]
|
||||
end
|
||||
|
||||
def default_directory
|
||||
|
@ -227,15 +224,6 @@ module Gitlab
|
|||
File.join(default_directory, "#{job.id}.log")
|
||||
end
|
||||
|
||||
def deprecated_path
|
||||
File.join(
|
||||
Settings.gitlab_ci.builds_path,
|
||||
job.created_at.utc.strftime("%Y_%m"),
|
||||
job.project.ci_id.to_s,
|
||||
"#{job.id}.log"
|
||||
) if job.project&.ci_id
|
||||
end
|
||||
|
||||
def trace_artifact
|
||||
job.job_artifacts_trace
|
||||
end
|
||||
|
|
|
@ -329,14 +329,6 @@ shared_examples_for 'trace with disabled live trace feature' do
|
|||
it_behaves_like 'read successfully with IO'
|
||||
end
|
||||
|
||||
context 'when current_path (with project_ci_id) exists' do
|
||||
before do
|
||||
expect(trace).to receive(:deprecated_path) { expand_fixture_path('trace/sample_trace') }
|
||||
end
|
||||
|
||||
it_behaves_like 'read successfully with IO'
|
||||
end
|
||||
|
||||
context 'when db trace exists' do
|
||||
before do
|
||||
build.send(:write_attribute, :trace, "data")
|
||||
|
@ -396,37 +388,6 @@ shared_examples_for 'trace with disabled live trace feature' do
|
|||
end
|
||||
end
|
||||
|
||||
context 'deprecated path' do
|
||||
let(:path) { trace.send(:deprecated_path) }
|
||||
|
||||
context 'with valid ci_id' do
|
||||
before do
|
||||
build.project.update(ci_id: 1000)
|
||||
|
||||
FileUtils.mkdir_p(File.dirname(path))
|
||||
|
||||
File.open(path, "w") do |file|
|
||||
file.write("data")
|
||||
end
|
||||
end
|
||||
|
||||
it "trace exist" do
|
||||
expect(trace.exist?).to be(true)
|
||||
end
|
||||
|
||||
it "can be erased" do
|
||||
trace.erase!
|
||||
expect(trace.exist?).to be(false)
|
||||
end
|
||||
end
|
||||
|
||||
context 'without valid ci_id' do
|
||||
it "does not return deprecated path" do
|
||||
expect(path).to be_nil
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'stored in database' do
|
||||
before do
|
||||
build.send(:write_attribute, :trace, "data")
|
||||
|
|
Loading…
Reference in New Issue