reenable merging to origin:master #1021
Merged
Conversation
This file contains hidden or 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
openshift-ci-robot
added
the
size/XS
Contributor
|
/lgtm |
Contributor
|
@deads2k: Updated the
DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
wking
added a commit
to wking/openshift-release
that referenced
this pull request
Jul 30, 2018
… config It was moved to its own section in 070b90a (Exclude merging to openshift/origin#master, 2018-04-09, openshift#761) to pick up an excludedBranches section. But that excludedBranches section was dropped in 2bd76e3 (reenable merging to origin:master, 2018-06-28, openshift#1021). Now that its Tide config is no longer unique, move it back up into its previous group.
wking
added a commit
to wking/openshift-release
that referenced
this pull request
Jul 30, 2018
The installer repo grew an OWNERS file with openshift/installer@49779c3e (OWNERS: Configure Prow with approver and reviewer information, 2018-07-25, openshift/installer#71), so now it has approvers who are authorized to add the 'approved' label. This commit adjusts Tide to require that 'approved' label for installer merges. There are three Tide config groups with the same requirements: * The one I'm moving openshift/installer to with this commit. * One for openshift/origin. The origin repo was moved to its own section in 070b90a (Exclude merging to openshift/origin#master, 2018-04-09, openshift#761) to pick up an excludedBranches section. But that excludedBranches section was dropped in 2bd76e3 (reenable merging to origin:master, 2018-06-28, openshift#1021). However, we still want to keep origin in a separate section to make merge gating on rebases easier [1]. From Michalis [2]: When @openshift/sig-master want to land a kubernetes rebase in openshift/origin#master, we need to block merges on that branch and at the same time we don't want to be blocking merges elsewhere, hence origin has its own query. The installer repository doesn't need Kubernetes rebase gating, so it shouldn't go into this section. * One for openshift/online-registration and openshift/enterprise-images. This section was created in 5b004d2 (Single out hidden repo in tide queries, 2018-03-22, openshift#707). But the installer repo is public, so it shouldn't go into the hidden-repo section. [1]: openshift#1122 (comment) [2]: openshift#1122 (comment)
derekhiggins
pushed a commit
to derekhiggins/release
that referenced
this pull request
Oct 24, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
The rebase has landed. This effectively reverts: #1018
/assign @Kargakis @mfojtik @smarterclayton