Merge branch '46010-runner-type-not-null' into 'master'
Set `ci_runners.runner_type` not null See merge request gitlab-org/gitlab-ce!18825
This commit is contained in:
commit
e960931828
|
@ -58,6 +58,7 @@ module Ci
|
|||
validate :tag_constraints
|
||||
validate :either_projects_or_group
|
||||
validates :access_level, presence: true
|
||||
validates :runner_type, presence: true
|
||||
|
||||
acts_as_taggable
|
||||
|
||||
|
|
|
@ -0,0 +1,9 @@
|
|||
class SetRunnerTypeNotNull < ActiveRecord::Migration
|
||||
include Gitlab::Database::MigrationHelpers
|
||||
|
||||
DOWNTIME = false
|
||||
|
||||
def change
|
||||
change_column_null(:ci_runners, :runner_type, false)
|
||||
end
|
||||
end
|
|
@ -11,7 +11,7 @@
|
|||
#
|
||||
# It's strongly recommended that you check this file into your version control system.
|
||||
|
||||
ActiveRecord::Schema.define(version: 20180508055821) do
|
||||
ActiveRecord::Schema.define(version: 20180508135515) do
|
||||
|
||||
# These are extensions that must be enabled in order to support this database
|
||||
enable_extension "plpgsql"
|
||||
|
@ -497,7 +497,7 @@ ActiveRecord::Schema.define(version: 20180508055821) do
|
|||
t.integer "access_level", default: 0, null: false
|
||||
t.string "ip_address"
|
||||
t.integer "maximum_timeout"
|
||||
t.integer "runner_type", limit: 2
|
||||
t.integer "runner_type", limit: 2, null: false
|
||||
end
|
||||
|
||||
add_index "ci_runners", ["contacted_at"], name: "index_ci_runners_on_contacted_at", using: :btree
|
||||
|
|
|
@ -6,6 +6,7 @@ FactoryBot.define do
|
|||
is_shared false
|
||||
active true
|
||||
access_level :not_protected
|
||||
runner_type :project_type
|
||||
|
||||
trait :online do
|
||||
contacted_at Time.now
|
||||
|
@ -13,6 +14,7 @@ FactoryBot.define do
|
|||
|
||||
trait :shared do
|
||||
is_shared true
|
||||
runner_type :instance_type
|
||||
end
|
||||
|
||||
trait :specific do
|
||||
|
|
|
@ -3,6 +3,7 @@ require 'spec_helper'
|
|||
describe Ci::Runner do
|
||||
describe 'validation' do
|
||||
it { is_expected.to validate_presence_of(:access_level) }
|
||||
it { is_expected.to validate_presence_of(:runner_type) }
|
||||
|
||||
context 'when runner is not allowed to pick untagged jobs' do
|
||||
context 'when runner does not have tags' do
|
||||
|
|
Loading…
Reference in New Issue