1 files changed, 8 insertions, 12 deletions
diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index 61194c9b7d1..f41ad890184 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -2,6 +2,7 @@
 
 module Ci
   class Runner < Ci::ApplicationRecord
+    prepend Ci::BulkInsertableTags
     include Gitlab::SQL::Pattern
     include RedisCacheable
     include ChronicDurationAttribute
@@ -14,6 +15,8 @@ module Ci
     include Presentable
     include EachBatch
 
+    ignore_column :semver, remove_with: '15.3', remove_after: '2022-07-22'
+
     add_authentication_token_field :token, encrypted: :optional, expires_at: :compute_token_expiration, expiration_enforced?: :token_expiration_enforced?
 
     enum access_level: {
@@ -75,9 +78,9 @@ module Ci
     has_many :groups, through: :runner_namespaces, disable_joins: true
 
     has_one :last_build, -> { order('id DESC') }, class_name: 'Ci::Build'
+    has_one :runner_version, primary_key: :version, foreign_key: :version, class_name: 'Ci::RunnerVersion'
 
     before_save :ensure_token
-    before_save :update_semver, if: -> { version_changed? }
 
     scope :active, -> (value = true) { where(active: value) }
     scope :paused, -> { active(false) }
@@ -430,7 +433,6 @@ module Ci
         values = values&.slice(:version, :revision, :platform, :architecture, :ip_address, :config, :executor) || {}
         values[:contacted_at] = Time.current
         values[:executor_type] = EXECUTOR_NAME_TO_TYPES.fetch(values.delete(:executor), :unknown)
-        values[:semver] = semver_from_version(values[:version])
 
         cache_attributes(values)
 
@@ -451,16 +453,6 @@ module Ci
       read_attribute(:contacted_at)
     end
 
-    def semver_from_version(version)
-      parsed_runner_version = ::Gitlab::VersionInfo.parse(version)
-
-      parsed_runner_version.valid? ? parsed_runner_version.to_s : nil
-    end
-
-    def update_semver
-      self.semver = semver_from_version(self.version)
-    end
-
     def namespace_ids
       strong_memoize(:namespace_ids) do
         runner_namespaces.pluck(:namespace_id).compact
@@ -484,6 +476,10 @@ module Ci
 
     private
 
+    scope :with_upgrade_status, ->(upgrade_status) do
+      Ci::Runner.joins(:runner_version).where(runner_version: { status: upgrade_status })
+    end
+
     EXECUTOR_NAME_TO_TYPES = {
       'unknown' => :unknown,
       'custom' => :custom,