Skip to content
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

We do not need patch manager approval for cherry picks for Cincinnati #15179

Conversation

LalatenduMohanty
Copy link
Member

As these are not part of OpenShift release payload and we build these in CPaaS and
released separately

Signed-off-by: Lalatendu Mohanty lmohanty@redhat.com

As these are not part of OpenShift release payload and we build these in CPaaS and
released separately

Signed-off-by: Lalatendu Mohanty <lmohanty@redhat.com>
@LalatenduMohanty LalatenduMohanty force-pushed the remove_cherrypick_approvals_for_Cincy_repos branch from 51c44f2 to 564e6ff Compare January 22, 2021 17:22
@LalatenduMohanty
Copy link
Member Author

CC @sdodson @vrutkovs

@vrutkovs
Copy link
Member

/hold

I think that removes all restrictions. Instead we want to be moved to a different group without cherry-pick-approved like https://github.com/LalatenduMohanty/release/blob/remove_cherrypick_approvals_for_Cincy_repos/core-services/prow/02_config/_config.yaml#L2420-L2432

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 22, 2021
@LalatenduMohanty
Copy link
Member Author

LalatenduMohanty commented Jan 22, 2021

@vrutkovs It is already part of that group check https://github.com/openshift/release/blob/master/core-services/prow/02_config/_config.yaml#L1610-L1611

 labels:
    - lgtm
    - approved
    - bugzilla/valid-bug

Also you might want to check the PR which introduced it openshift/cincinnati#314

@vrutkovs
Copy link
Member

Ah, right.

/hold cancel

Not sure why prow-config is failing - perhaps make update is needed?

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 22, 2021
Signed-off-by: Lalatendu Mohanty <lmohanty@redhat.com>
@LalatenduMohanty
Copy link
Member Author

Not sure why prow-config is failing - perhaps make update is needed?

Re-ran make prow-config to generate the prow configs and added the change in a separate commit.

@vrutkovs
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 22, 2021
@sdodson
Copy link
Member

sdodson commented Jan 25, 2021

/approve
I don't think I can apply the label via the bot but I can assert that this is the policy we wish to use.

@sdodson
Copy link
Member

sdodson commented Jan 25, 2021

@petr-muller ptal

@petr-muller
Copy link
Member

/approve

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: LalatenduMohanty, petr-muller, sdodson, vrutkovs

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 25, 2021
@openshift-merge-robot openshift-merge-robot merged commit ac5aae6 into openshift:master Jan 25, 2021
@openshift-ci-robot
Copy link
Contributor

@LalatenduMohanty: Updated the following 2 configmaps:

  • config configmap in namespace ci at cluster api.ci using the following files:
    • key config.yaml using file core-services/prow/02_config/_config.yaml
  • config configmap in namespace ci at cluster app.ci using the following files:
    • key config.yaml using file core-services/prow/02_config/_config.yaml

In response to this:

As these are not part of OpenShift release payload and we build these in CPaaS and
released separately

Signed-off-by: Lalatendu Mohanty lmohanty@redhat.com

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 Apr 7, 2021
…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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants