[chore] Add CI check to enforce merge freeze during release #37097
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dmitryax
approved these changes
Jan 11, 2025
mx-psi
approved these changes
Jan 13, 2025
mowies
reviewed
Jan 14, 2025
mowies
approved these changes
Jan 14, 2025
Co-authored-by: Moritz Wiesinger <[email protected]>
|
I am going to merge this and we are going to follow the test steps from open-telemetry/opentelemetry-collector/pull/11936. Since opentelemetry-collector-contrib does not have a merge queue yet the check is more limited so the tests won't be exactly the same. |
codeboten
approved these changes
Jan 14, 2025
|
I have not found a way to test this, the release PR requires the tags to be present. I'll reach out to the release manager to let them know that they should revert this PR if trouble arises |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
As stated in the Release Procedure document, all merging in Contrib should be halted while the "Prepare release" PR is open. This PR adds a CI check which fails if such a release PR is currently open.
This is the same as the CI check introduced in Core as part of this issue (Initial PR, bug, fix, bug 2, fix 2, fix 3, fix 4).
Like its predecessor, this will only be fully effective once the merge queue is enabled on this repo (see #36788 for progress on that), enabling us to do proper last-minute checks instead of relying on the freeze status at the time of the latest PR update. Similarly, for proper enforcement, this check will need to be marked as required in the main branch protections (I will create an issue on the community repo to that effect once this PR is merged).
Link to tracking issue
Updates #36848
Testing
Considering the multiple iterations this code went through on Core, it should now work properly without adaptation.
However, considering the multiple iterations this code went through on Core, we should expect the unexpected, especially when it comes to the interaction with the merge queue, so release managers will need to be aware of this change, in case it breaks the release process.