1 files changed, 10 insertions, 0 deletions
diff --git a/app/models/ci/build_need.rb b/app/models/ci/build_need.rb
index 7bc70f9f1e1..4a59c25cbb0 100644
--- a/app/models/ci/build_need.rb
+++ b/app/models/ci/build_need.rb
@@ -5,6 +5,9 @@ module Ci
     extend Gitlab::Ci::Model
 
     include BulkInsertSafe
+    include IgnorableColumns
+
+    ignore_columns :build_id_convert_to_bigint, remove_with: '14.1', remove_after: '2021-07-22'
 
     belongs_to :build, class_name: "Ci::Processable", foreign_key: :build_id, inverse_of: :needs
 
@@ -14,5 +17,12 @@ module Ci
 
     scope :scoped_build, -> { where('ci_builds.id=ci_build_needs.build_id') }
     scope :artifacts, -> { where(artifacts: true) }
+
+    # TODO: Remove once build_id_convert_to_bigint is not an "ignored" column anymore (see .ignore_columns above)
+    # There is a database-side trigger to populate this column. This is unexpected in the context
+    # of cloning an instance, e.g. when retrying the job. Hence we exclude the ignored column explicitly here.
+    def attributes
+      super.except('build_id_convert_to_bigint')
+    end
   end
 end