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

[release-4.3] Bug 1796079: Backport OLM filter by OS and ARCH #4928

Conversation

benjaminapetersen
Copy link
Contributor

@openshift-ci-robot
Copy link
Contributor

@benjaminapetersen: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

[release-4.3] Backport OLM filter by OS and ARCH

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.

@benjaminapetersen benjaminapetersen changed the title [release-4.3] Backport OLM filter by OS and ARCH [release-4.3] Bug 1796079: Backport OLM filter by OS and ARCH Apr 6, 2020
@benjaminapetersen
Copy link
Contributor Author

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Apr 6, 2020
@openshift-ci-robot
Copy link
Contributor

@benjaminapetersen: This pull request references Bugzilla bug 1796079, which is invalid:

  • expected dependent Bugzilla bug 1796078 to target the "4.4.0" release, but it targets "4.5.0" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/bugzilla refresh

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.

@openshift-ci-robot openshift-ci-robot added component/core Related to console core functionality approved Indicates a PR has been approved by an approver from all required OWNERS files. component/olm Related to OLM labels Apr 6, 2020
@openshift-ci-robot
Copy link
Contributor

@benjaminapetersen: This pull request references Bugzilla bug 1796079, which is invalid:

  • expected dependent Bugzilla bug 1796078 to target the "4.4.0" release, but it targets "4.5.0" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

[release-4.3] Bug 1796079: Backport OLM filter by OS and ARCH

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.

@benjaminapetersen
Copy link
Contributor Author

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Apr 6, 2020
@openshift-ci-robot
Copy link
Contributor

@benjaminapetersen: This pull request references Bugzilla bug 1796079, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.3.z) matches configured target release for branch (4.3.z)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1804851 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA))
  • dependent Bugzilla bug 1804851 targets the "4.4.0" release, matching the expected (4.4.0) release
  • bug has dependents

In response to this:

/bugzilla refresh

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.

@benjaminapetersen benjaminapetersen force-pushed the backport/release-4.3/cherry-pick/operator-hub-filtering-by-os-and-arch branch from 69bf9e4 to 70ecbf5 Compare April 6, 2020 17:32
// - if the operator has no flags, treat it with the defaults
// - if it has any flags, it must list all flags (no defaults applied)
const relevantLabels = _.reduce(
_.get(items, 'obj.metadata.labels', []),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

had to convert this from the typescript chaining.

@benjaminapetersen
Copy link
Contributor Author

@TheRealJon @spadgett for review.
Backport of the PRs in the description. Minor tweaks to fix conflicts and typescript issues.

@benjaminapetersen
Copy link
Contributor Author

benjaminapetersen commented Apr 6, 2020

/cherry-pick release-4.2

for bug https://bugzilla.redhat.com/show_bug.cgi?id=1796080

@openshift-cherrypick-robot

@benjaminapetersen: once the present PR merges, I will cherry-pick it on top of release-4.2 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.2

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.

@spadgett
Copy link
Member

spadgett commented Apr 7, 2020

cc @shawn-hurley @jwforres

/hold
for the corresponding OLM changes

@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 Apr 7, 2020
@spadgett
Copy link
Member

spadgett commented Apr 7, 2020

linter errors

@benjaminapetersen
Copy link
Contributor Author

/retest

the flakes, looking into linting. our prettier config is different at 4.3.

@spadgett spadgett added this to the v4.3.z milestone May 4, 2020
@benjaminapetersen
Copy link
Contributor Author

/hold cancel

OLM changes have merged.

@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 Jun 4, 2020
Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 5, 2020
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@spadgett
Copy link
Member

spadgett commented Jun 5, 2020

/lgtm cancel

@benjaminapetersen failed the linter :/

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jun 5, 2020
@spadgett spadgett force-pushed the backport/release-4.3/cherry-pick/operator-hub-filtering-by-os-and-arch branch from 70ecbf5 to ad89b55 Compare June 8, 2020 14:18
@spadgett
Copy link
Member

spadgett commented Jun 8, 2020

I ran prettier on the commit and pushed the change.

Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 8, 2020
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@spadgett
Copy link
Member

spadgett commented Jun 8, 2020

/lgtm cancel

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jun 8, 2020
@spadgett spadgett force-pushed the backport/release-4.3/cherry-pick/operator-hub-filtering-by-os-and-arch branch from ad89b55 to 484f54c Compare June 8, 2020 17:19
@spadgett
Copy link
Member

spadgett commented Jun 8, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 8, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: benjaminapetersen, spadgett

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:
  • OWNERS [benjaminapetersen,spadgett]

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

@knobunc knobunc added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jun 10, 2020
@openshift-merge-robot openshift-merge-robot merged commit 313b7f9 into openshift:release-4.3 Jun 10, 2020
@openshift-ci-robot
Copy link
Contributor

@benjaminapetersen: All pull requests linked via external trackers have merged: openshift/console#4928. Bugzilla bug 1796079 has been moved to the MODIFIED state.

In response to this:

[release-4.3] Bug 1796079: Backport OLM filter by OS and ARCH

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.

@openshift-cherrypick-robot

@benjaminapetersen: #4928 failed to apply on top of branch "release-4.2":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	cmd/bridge/main.go
A	frontend/packages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-items.tsx
M	frontend/public/declarations.d.ts
M	pkg/server/server.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/server/server.go
CONFLICT (content): Merge conflict in pkg/server/server.go
Auto-merging frontend/public/declarations.d.ts
Auto-merging frontend/public/components/operator-hub/operator-hub-items.tsx
CONFLICT (content): Merge conflict in frontend/public/components/operator-hub/operator-hub-items.tsx
Auto-merging cmd/bridge/main.go
CONFLICT (content): Merge conflict in cmd/bridge/main.go
Patch failed at 0001 Backport OLM filter by OS and ARCH

In response to this:

/cherry-pick release-4.2

for bug https://bugzilla.redhat.com/show_bug.cgi?id=1796080

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
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. component/backend Related to backend component/core Related to console core functionality component/olm Related to OLM lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants