ee_compat_check passes even when there are errors
Build https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/141503064 from MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24056 passed, even though there was an error:
==> Finished in 0.060998826 seconds
error: patch failed: db/schema.rb:2439
Falling back to three-way merge...
Applied patch to 'db/schema.rb' with conflicts.
U db/schema.rb
This then results in the Merge Train not being able to automatically merge this file, even when using -s recursive -Xours
:
Auto-merging spec/lib/gitlab/import_export/safe_model_attributes.yml
Auto-merging spec/lib/gitlab/import_export/all_models.yml
Auto-merging lib/gitlab/import_export/relation_factory.rb
Auto-merging lib/gitlab/import_export/import_export.yml
Auto-merging lib/api/entities.rb
Auto-merging db/schema.rb
CONFLICT (content): Merge conflict in db/schema.rb
Automatic merge failed; fix conflicts and then commit the result
The conflict is as follows:
diff --cc db/schema.rb
index be3271cbe5f,97daf8ee617..00000000000
--- a/db/schema.rb
+++ b/db/schema.rb
@@@ -3387,12 -2449,11 +3397,16 @@@ ActiveRecord::Schema.define(version: 20
add_foreign_key "protected_tag_create_access_levels", "users"
add_foreign_key "protected_tags", "projects", name: "fk_8e4af87648", on_delete: :cascade
add_foreign_key "push_event_payloads", "events", name: "fk_36c74129da", on_delete: :cascade
++<<<<<<< .merge_file_oi7tac
+ add_foreign_key "push_rules", "projects", name: "fk_83b29894de", on_delete: :cascade
++=======
+ add_foreign_key "release_links", "releases", on_delete: :cascade
++>>>>>>> .merge_file_5yQ48V
add_foreign_key "releases", "projects", name: "fk_47fe2a0596", on_delete: :cascade
add_foreign_key "releases", "users", column: "author_id", name: "fk_8e4456f90f", on_delete: :nullify
- add_foreign_key "remote_mirrors", "projects", on_delete: :cascade
+ add_foreign_key "remote_mirrors", "projects", name: "fk_43a9aa4ca8", on_delete: :cascade
add_foreign_key "repository_languages", "projects", on_delete: :cascade
+ add_foreign_key "resource_label_events", "epics", on_delete: :cascade
add_foreign_key "resource_label_events", "issues", on_delete: :cascade
add_foreign_key "resource_label_events", "labels", on_delete: :nullify
add_foreign_key "resource_label_events", "merge_requests", on_delete: :cascade