Organize CI and Danger backports for the new patch release process
We have been backporting any changes made to Danger or CI rules to previous stable branches as we work through them for the extended maintenance policy. However, we have also started to make updates to some of our previous changes. As this work is also spanning beyond one milestone, I want to be sure we don't end up with stable branches that have unexpected rules.
One example is we added Danger failures for any MRs targeting stable branches outside of the maintenance policy, but then decided we do need to allow merging into those branches, so we removed that Danger rule. We had already backported the former and now need to be sure we backport the update to the correct branches so we don't end up with one or two versions that throw these failures.
This issue is meant to track any changes made that we want to backport to stable branches so we are sure that they all end up together on the relevant stable branches when we rollout the extended maintenance policy.
Rollout is expected in 16.0, so we want all of these to exist on 15.9, 15.10, and 15.11 at the least. We need to be sure any branches in course of development don't have conflicting rules merged.
MR List and notes
Status | MR | Merged in | Does this need to be backported? | Notes | Backports |
---|---|---|---|---|---|
gitlab-org/gitlab!104870 (merged) | 15.7 | No | Danger fails unless ~type::bug is used and if outside the policy |
The next two MRs modify this one | |
gitlab-org/gitlab!111514 (merged) | 15.9 | Yes | This alters the behavior in gitlab-org/gitlab!104870 (merged), so it should be backported in 15.8 and 15.7. Otherwise 15.8 and 15.7 will experience failures once outside the policy. | 15.8 - gitlab-org/gitlab!112733 (merged), 15.7 gitlab-org/gitlab!112734 (merged) | |
gitlab-org/gitlab!111984 (merged) | 15.9 | Yes | This alters the behavior in gitlab-org/gitlab!104870 (merged), so it should be backported in 15.8 and 15.7 Otherwise 15.8 and 15.7 will experience failures once outside the policy. (can be done together with the above change) | 15.8 - gitlab-org/gitlab!112733 (merged), 15.7 gitlab-org/gitlab!112734 (merged) | |
gitlab-org/gitlab!108718 (merged) | 15.8 | No | Slack is notified on stable branch failure | 15.7 gitlab-org/gitlab!109213 (merged), 15.6 gitlab-org/gitlab!109216 (merged) | |
gitlab-org/gitlab!110127 (merged) | 15.9 | No | Issue is created on stable branch failure | 15.8 gitlab-org/gitlab!110847 (merged), 15.7 gitlab-org/gitlab!110848 (merged) | |
gitlab-org/gitlab!110962 (merged) | 15.9 | No | Danger fails with ~pipeline:expidite , adds danger message about package-and-test |
- | |
gitlab-org/gitlab!111645 (merged) | 15.9 | Yes | Reverted with gitlab-org/gitlab!112238 (merged) in 15.10 | 15.9 revert gitlab-org/gitlab!112609 (merged) | |
gitlab-org/gitlab!112751 (merged) | 15.9 | No | Skips Danger checks on documentation MRs | 15.9 gitlab-org/gitlab!113549 (merged) | |
gitlab-org/gitlab!112740 (merged) | 15.9 | No | Remove Pick into x.x message from Danger |
15.9 gitlab-org/gitlab!113549 (merged) | |
15.9 gitlab-org/gitlab!112742 (merged) | 15.9 | No | Split QA into a dedicated section | 15.9 gitlab-org/gitlab!113549 (merged) | |
gitlab-org/gitlab!112736 (merged) | 15.9 | No | Introduce a stable MR template | 15.9 gitlab-org/gitlab!113549 (merged) | |
gitlab-org/gitlab!112855 (merged) | 15.9 | No | Highlights package-and-test message | 15.9 gitlab-org/gitlab!113549 (merged) | |
gitlab-org/gitlab!113272 (merged) | 15.9 | No | Fails danger if package-and-test pipeline is canceled | 15.9 gitlab-org/gitlab!113549 (merged) | |
gitlab-org/gitlab!113431 (merged) | 15.9 | No | Skips package-and-test on trivial | 15.9 gitlab-org/gitlab!113549 (merged) | |
gitlab-org/gitlab!113281 (merged) | 15.9 | No | MRs Prevent QA check on stable branches | 15.9 gitlab-org/gitlab!113549 (merged) | |
gitlab-org/gitlab!113564 (merged) | 15.9 | No | Skip Danger failure when package-and-test is being created | 15.9 gitlab-org/gitlab!113871 (merged) | |
Pending merge | gitlab-org/gitlab!112367 (merged) | 15.10 | No | Adds a discussion on package-and-test failure | - |
Pending merge | gitlab-org/quality/triage-ops!1986 (merged) | 15.10 | No | Adds a package-and-test discussion on approval | - |
gitlab-org/gitlab!113886 (merged) | 15.10 | Yes | Removes pipeline:expedite from incident issue template |
15.9: gitlab-org/gitlab!114311 (merged) | |
gitlab-org/gitlab!114310 (merged) | 15.10 | Yes | Clarifies purpose of the stable branch template | 15.9: gitlab-org/gitlab!114311 (merged) | |
gitlab-org/gitlab!114949 (merged) | 15.10 | Yes | Updates stable branch template | 15.9: gitlab-org/gitlab!115063 (merged) | |
gitlab-org/gitlab!114802 (merged) | 15.10 | Yes | Updates Danger checks to consider no downstream pipeline | 15.9: gitlab-org/gitlab!115063 (merged) |