Merge branch 'jc-change-runner-features-column' into 'master'

Add runner_features column runtime_runner_features

See merge request gitlab-org/gitlab!72378

app/models/ci/build_metadata.rb

@@ -39,6 +39,7 @@ module Ci
 
     ignore_column :build_id_convert_to_bigint, remove_with: '14.5', remove_after: '2021-10-22'
     ignore_columns :id_convert_to_bigint, remove_with: '14.5', remove_after: '2021-10-22'
+    ignore_columns :runner_features, remove_with: '14.7', remove_after: '2021-11-22'
 
     def update_timeout_state
       timeout = timeout_with_highest_precedence

app/models/concerns/ci/metadatable.rb

@@ -20,7 +20,6 @@ module Ci
       delegate :interruptible, to: :metadata, prefix: false, allow_nil: true
       delegate :has_exposed_artifacts?, to: :metadata, prefix: false, allow_nil: true
       delegate :environment_auto_stop_in, to: :metadata, prefix: false, allow_nil: true
-      delegate :runner_features, to: :metadata, prefix: false, allow_nil: false
       before_create :ensure_metadata
     end
 

db/migrate/20211020030948_add_runtime_runner_features_to_ci_builds_metadata.rb

+# frozen_string_literal: true
+
+class AddRuntimeRunnerFeaturesToCiBuildsMetadata < Gitlab::Database::Migration[1.0]
+  enable_lock_retries!
+
+  def change
+    add_column :ci_builds_metadata, :runtime_runner_features, :jsonb, default: {}, null: false
+  end
+end

db/schema_migrations/20211020030948

+97e8b2ce324594581ec0af65840a0dde8271b1b2712e22059f5c26b30d7d5cac
\ No newline at end of file

db/structure.sql

@@ -11428,7 +11428,8 @@ CREATE TABLE ci_builds_metadata (
     secrets jsonb DEFAULT '{}'::jsonb NOT NULL,
     build_id bigint NOT NULL,
     id bigint NOT NULL,
-    runner_features jsonb DEFAULT '{}'::jsonb NOT NULL
+    runner_features jsonb DEFAULT '{}'::jsonb NOT NULL,
+    runtime_runner_features jsonb DEFAULT '{}'::jsonb NOT NULL
 );
 
 CREATE SEQUENCE ci_builds_metadata_id_seq

spec/models/ci/bridge_spec.rb

@@ -17,8 +17,6 @@ RSpec.describe Ci::Bridge do
     { trigger: { project: 'my/project', branch: 'master' } }
   end
 
-  it { is_expected.to respond_to(:runner_features) }
-
   it 'has many sourced pipelines' do
     expect(bridge).to have_many(:sourced_pipelines)
   end

spec/models/ci/build_spec.rb

@@ -35,7 +35,6 @@ RSpec.describe Ci::Build do
 
   it { is_expected.to respond_to(:has_trace?) }
   it { is_expected.to respond_to(:trace) }
-  it { is_expected.to respond_to(:runner_features) }
 
   it { is_expected.to delegate_method(:merge_request?).to(:pipeline) }
   it { is_expected.to delegate_method(:merge_request_ref?).to(:pipeline) }