Ensure post upgrade steps are run after geo_pg_upgrade

Ian Baumrequested to merge
fix-geo-pg-upgrade-calls into master

What does this MR do?

Ensure post upgrade steps are run after geo_pg_upgrade

  • Running these steps before geo_pg_upgrade is called breaks the upgrade of the geo-postgresql database

Related issues

#7768 (closed)

Checklist

See Definition of done.

For anything in this list which will not be completed, please provide a reason in the MR discussion.

Required

  • MR title and description are up to date, accurate, and descriptive.
  • MR targeting the appropriate branch.
  • Latest Merge Result pipeline is green.
  • When ready for review, MR is labeled "~workflow::ready for review" per the Distribution MR workflow.

For GitLab team members

If you don't have access to this, the reviewer should trigger these jobs for you during the review process.

  • The manual Trigger:ee-package jobs have a green pipeline running against latest commit.
  • If config/software or config/patches directories are changed, make sure the build-package-on-all-os job within the Trigger:ee-package downstream pipeline succeeded.
  • If you are changing anything SSL related, then the Trigger:package:fips manual job within the Trigger:ee-package downstream pipeline must succeed.
  • If CI configuration is changed, the branch must be pushed to dev.gitlab.org to confirm regular branch builds aren't broken.

Expected (please provide an explanation if not completing)

  • Test plan indicating conditions for success has been posted and passes.
  • Documentation created/updated.
  • Tests added.
  • Integration tests added to GitLab QA.
  • Equivalent MR/issue for the GitLab Chart opened.
  • Validate potential values for new configuration settings. Formats such as integer 10, duration 10s, URI scheme://user:passwd@host:port may require quotation or other special handling when rendered in a template and written to a configuration file.

Testing

This changes the upgrade process for the following scenarios. We should ensure that gitlab-ctl pg-upgrade -V 14 runs without error in each case

Tested Instance Type Package Job Tested by Notes
✅ Single node instance https://gitlab.com/gitlab-org/omnibus-gitlab/-/jobs/5943158156 ibaum
✅ Separate db, and tracking db nodes https://gitlab.com/gitlab-org/omnibus-gitlab/-/jobs/5962370135 ibaum
✅ Patroni, with tracking db on standby leader https://gitlab.com/gitlab-org/omnibus-gitlab/-/jobs/5962370135 ibaum !7247 (comment 1731649052)
✅ Patroni, with tracking db on standby replica https://gitlab.com/gitlab-org/omnibus-gitlab/-/jobs/5943158156 ibaum Needed changes from 0a046676 to build instance
✅ Patroni for both db, and tracking db https://gitlab.com/gitlab-org/omnibus-gitlab/-/jobs/5962370135 ibaum
Edited by Ian Baum

Merge request reports