Skip to content

Revert migration squash that breaks 15.11

Jon Jenkins requested to merge 409331-revert-squash into 15-11-stable-ee

What does this MR do and why?

In April, I had !116021 (merged) merged, which squashed a migration that had a timestamp from January, but its corresponding commit was dated for October, which is after the squash date. This caused #409331 (closed), which prompted me to revert the squash in !118368 (merged). The revert was not present in 15.11.0 and 15.11.1, so any upgrades from 15.11.x to 16 will result in the un-squashed migrations being present for the upgrade, resulting in db:migrate attempting to re-run the init_schema migration, which naturally results in a failure.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

  • This MR is backporting a bug fix, documentation update, or spec fix, previously merged in the default branch.
  • The original MR has been deployed to GitLab.com (not applicable for documentation or spec changes).
  • This MR has a severity label assigned (if applicable).
  • This MR has been approved by a maintainer (only one approval is required).
  • Ensure the e2e:package-and-test-ee job has either succeeded or been approved by a Software Engineer in Test.

Note to the merge request author and maintainer

The process of backporting bug fixes into stable branches is tracked as part of an internal pilot. If you have questions about this process, please:

Edited by Jon Jenkins

Merge request reports

Loading