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

OCPBUGS-12891: check for valid OLM selector in K8sResourceWidget to p… #12887

Merged
merged 1 commit into from Jul 10, 2023

Conversation

rhamilto
Copy link
Member

…revent run time error.

After:

Screenshot 2023-06-12 at 12 20 23 PM

Many thanks to @TheRealJon for the assist on this one!

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 12, 2023
@openshift-ci-robot
Copy link
Contributor

@rhamilto: This pull request references Jira Issue OCPBUGS-12891, which is invalid:

  • expected the bug to target the "4.14.0" version, but no target version was set

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

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

…revent run time error.

After:

Screenshot 2023-06-12 at 12 20 23 PM

Many thanks to @TheRealJon for the assist on this one!

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 the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Jun 12, 2023
@openshift-ci openshift-ci bot added component/olm Related to OLM component/shared Related to console-shared approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jun 12, 2023
@rhamilto
Copy link
Member Author

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jun 12, 2023
@openshift-ci-robot
Copy link
Contributor

@rhamilto: This pull request references Jira Issue OCPBUGS-12891, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.0) matches configured target version for branch (4.14.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @yapei

In response to this:

/jira 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 openshift-ci bot requested a review from yapei June 12, 2023 17:05
@rhamilto
Copy link
Member Author

/retest

@rhamilto
Copy link
Member Author

/retest

2 similar comments
@rhamilto
Copy link
Member Author

/retest

@rhamilto
Copy link
Member Author

/retest

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 17, 2023

@rhamilto: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

Copy link
Member

@jhadvig jhadvig 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 openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 10, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 10, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jhadvig, rhamilto

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-merge-robot openshift-merge-robot merged commit 9384e59 into openshift:master Jul 10, 2023
6 checks passed
@openshift-ci-robot
Copy link
Contributor

@rhamilto: Jira Issue OCPBUGS-12891: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-12891 has been moved to the MODIFIED state.

In response to this:

…revent run time error.

After:

Screenshot 2023-06-12 at 12 20 23 PM

Many thanks to @TheRealJon for the assist on this one!

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.

@rhamilto rhamilto deleted the OCPBUGS-12891 branch July 10, 2023 21:01
@rhamilto
Copy link
Member Author

/cherry-pick release-4.13

@openshift-cherrypick-robot

@rhamilto: #12887 failed to apply on top of branch "release-4.13":

Applying: OCPBUGS-12891: check for valid OLM selector in K8sResourceWidget to prevent run time error
Using index info to reconstruct a base tree...
M	frontend/packages/console-shared/src/components/dynamic-form/widgets.tsx
M	frontend/packages/operator-lifecycle-manager/src/components/operand/utils.spec.ts
M	frontend/packages/operator-lifecycle-manager/src/components/operand/utils.ts
Falling back to patching base and 3-way merge...
Auto-merging frontend/packages/operator-lifecycle-manager/src/components/operand/utils.ts
CONFLICT (content): Merge conflict in frontend/packages/operator-lifecycle-manager/src/components/operand/utils.ts
Auto-merging frontend/packages/operator-lifecycle-manager/src/components/operand/utils.spec.ts
CONFLICT (content): Merge conflict in frontend/packages/operator-lifecycle-manager/src/components/operand/utils.spec.ts
Auto-merging frontend/packages/console-shared/src/components/dynamic-form/widgets.tsx
CONFLICT (content): Merge conflict in frontend/packages/console-shared/src/components/dynamic-form/widgets.tsx
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-12891: check for valid OLM selector in K8sResourceWidget to prevent run time error
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.13

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. component/olm Related to OLM component/shared Related to console-shared jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants