Automatic merge of gitlab-org/gitlab-ce master

changelogs/unreleased/ignore-artifact-attirbutes-in-project-import-export.yml

+---
+title: Ignore legacy artifact columns in Project Import/Export
+merge_request: 29427
+author:
+type: fixed

lib/gitlab/import_export/import_export.yml

@@ -169,6 +169,9 @@ excluded_attributes:
     - :when
     - :artifacts_file
     - :artifacts_metadata
+    - :artifacts_file_store
+    - :artifacts_metadata_store
+    - :artifacts_size
     - :commands
   push_event_payload:
     - :event_id

lib/gitlab/import_export/relation_factory.rb

@@ -155,6 +155,9 @@ module Gitlab
           @relation_hash.delete('trace') # old export files have trace
           @relation_hash.delete('token')
           @relation_hash.delete('commands')
+          @relation_hash.delete('artifacts_file_store')
+          @relation_hash.delete('artifacts_metadata_store')
+          @relation_hash.delete('artifacts_size')
 
           imported_object
         elsif @relation_name == :merge_requests

spec/lib/gitlab/import_export/project.json

@@ -6224,7 +6224,10 @@
               "erased_by_id": null,
               "erased_at": null,
               "type": "Ci::Build",
-              "token": "abcd"
+              "token": "abcd",
+              "artifacts_file_store": 1,
+              "artifacts_metadata_store": 1,
+              "artifacts_size": 10
             },
             {
               "id": 72,