core-services/prow/02_config: Restore Tide for Cincinanti release branches #17527
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
…nches 564e6ff (We do not need patch manager approval for cherry picks for Cincinnati, 2020-01-22, openshift#15179) removed our existing release-branch block without adding us to a different release-branch block. Here is where we are today: $ yaml2json <core-services/prow/02_config/_config.yaml | jq -r '.tide.queries[] | {labels, includedBranches, excludedBranches, repos: [(.repos // [])[] | select(contains("openshift/cincinnati"))]} | select((.repos | length) > 0)' { "labels": [ "lgtm", "approved" ], "includedBranches": [ "master", "main" ], "excludedBranches": null, "repos": [ "openshift/cincinnati", "openshift/cincinnati-operator" ] } { "labels": [ "lgtm", "approved", "bugzilla/valid-bug", "group-lead-approved" ], "includedBranches": [ "release-4.8", "openshift-4.8" ], "excludedBranches": null, "repos": [ "openshift/cincinnati", "openshift/cincinnati-operator" ] } { "labels": [ "lgtm", "approved" ], "includedBranches": null, "excludedBranches": [ "release-3.11", "release-4.0", "release-4.1", "release-4.2", "release-4.3", "release-4.4", "release-4.5", "release-4.6", "release-4.7", "release-4.8", "openshift-4.1", "openshift-4.2", "openshift-4.3", "openshift-4.4", "openshift-4.5", "openshift-4.6", "openshift-4.7", "openshift-4.8", "feature-es6x", "feature-prom-connector", "master", "main" ], "repos": [ "openshift/cincinnati", "openshift/cincinnati-operator" ] } { "labels": [ "lgtm", "approved" ], "includedBranches": null, "excludedBranches": null, "repos": [ "openshift/cincinnati-graph-data" ] } So cincinnati and cincinnati-operator had: * lgtm and approved for master and main (great) * lgtm, approved, valid-bug, and group-lead-approved for 4.8 (not what we want) * lgtm and approved for unrecognized branches (who cares?) * no Tide config for older release branches (not what we want). With this commit, I'm moving all of the Cincinnati entries under the "lgtm and approved for all branches" block. I'm not sure why we only have the one openshift-priv entry. It's originally from 4e4cd48 (private-prow-configs-mirror --release-repo-path, 2020-04-24, openshift#8553). In this commit, I'm just manually moving it alongside the other entries.
openshift-ci-robot
added
the
approved
It bothers me that this ordering is so unstable, but it is currently comparing the serialized TideQuery objects [1], and TideQuery objects put the least-stable orgs and repos first [2]. [1]: https://github.com/openshift/ci-tools/blob/4f2b89656b7aa14f1ee892c20e717b3dfdeb6034/cmd/determinize-prow-config/main.go#L113-L128 [2]: https://github.com/openshift/ci-tools/blob/4f2b89656b7aa14f1ee892c20e717b3dfdeb6034/vendor/k8s.io/test-infra/prow/config/tide.go#L208-L209
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: LalatenduMohanty, wking The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Contributor
|
@wking: 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. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
564e6ff (#15179) removed our existing release-branch block without adding us to a different release-branch block. Here is where we are today:
So cincinnati and cincinnati-operator had:
With this commit, I'm moving all of the Cincinnati entries under the "lgtm and approved for all branches" block.
I'm not sure why we only have the one
openshift-priventry. It's originally from 4e4cd48 (#8553). In this commit, I'm just manually moving it alongside the other entries.