HomePhabricator
Diffusion Scap 509ed9abb949

backport.py: Restore included_in branches check

Tags
None
Referenced Files
None
Subscribers
None

Description

backport.py: Restore included_in branches check

  • Restores check for included-in branches, which is used when confirming backports in the case a dependency was previously merged into a non-production branch, but the resulting commit eventually got included in a production branch. For example:
    1. Change A to operations/mediawiki-config master depends on Change B to mediawiki/core master
    2. Change B is merged into master and subsequently a train branch is cut and deployed.
  • Adds integration test for included-in branches check
  • Errors out when a change for backport is not deployable and removes any related integration tests
  • In wait_for_changes_to_be_merged, checks revision number directly instead of revisions[revision]["_number"]

Related MRs:
https://gitlab.wikimedia.org/repos/releng/train-dev/-/merge_requests/71

Bug: T360291
Bug: T362987

Details

Provenance
jeenaAuthored on Jun 4 2024, 11:00 PM
Parents
rMSCA72807e1c75fb: Release 4.85.0-1
Branches
Unknown
Tags
Unknown
ChangeId
None