-
Notifications
You must be signed in to change notification settings - Fork 2.1k
cluster/ci/config/prow/config.yaml: Consolidate openshift/origin Tide config #1122
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
… 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.
b31af0d to
7dc87a4
Compare
| - do-not-merge/work-in-progress | ||
| - do-not-merge/hold | ||
| - repos: | ||
| - openshift/origin |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please revert this change, we keep origin separate from the rest of the queries to make merge gating on rebases easier.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please revert this change, we keep origin separate from the rest of the queries to make merge gating on rebases easier.
So something like #707's pulling out openshift/online-registration? Is there a rule of thumb to decide whether a given repo should get its own section or not? I'm not clear on why openshift/origin would need a separate section while the rest of the repositories in the previous section do not.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
|
/hold |
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)
* reorganize existing pre-run validation Some of the validation steps only make sense when we're trying to build a cluster. For example, there is no reason to require a valid token or pull-secret when deleting a cluster. So, move the validation from common.sh into its own file, define functions to invoke the validations we need in different phases, then add those function calls to the relevant files. Signed-off-by: Doug Hellmann <[email protected]> * add earlier validation of CI registry token When not running in CI, the CI_TOKEN value should be checked early in the process of building to avoid waiting for a long time before discovering that it is invalid. Signed-off-by: Doug Hellmann <[email protected]>
It was moved to its own section in 070b90a (#761) to pick up an
excludedBranchessection. But thatexcludedBranchessection was dropped in 2bd76e3 (#1021). Now that its Tide config is no longer unique, move it back up into its previous group.