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

CNV-41292,OCPBUGS-36238: Sync Upstream/Downstream #47

Merged
merged 6 commits into from
Jul 15, 2024

Conversation

upalatucci
Copy link

No description provided.

@openshift-ci openshift-ci bot requested review from avivtur and metalice July 3, 2024 08:00
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 3, 2024
@upalatucci
Copy link
Author

/retest

@pcbailey
Copy link

pcbailey commented Jul 3, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 3, 2024
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD a787241 and 2 for PR HEAD b2ea8c8 in total

@qiowang721
Copy link

/retitle CNV-41292,OCPBUGS-36238: Sync Upstream/Downstream

@openshift-ci openshift-ci bot changed the title Sync Upstream/Downstream CNV-41292,OCPBUGS-36238: Sync Upstream/Downstream Jul 5, 2024
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jul 5, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 5, 2024

@upalatucci: This pull request references CNV-41292 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.17.0" version, but no target version was set.

This pull request references Jira Issue OCPBUGS-36238, which is invalid:

  • expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is ON_QA instead

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:

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 openshift-eng/jira-lifecycle-plugin repository.

@qiowang721
Copy link

/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 Jul 5, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 5, 2024

@qiowang721: This pull request references CNV-41292 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.17.0" version, but no target version was set.

This pull request references Jira Issue OCPBUGS-36238, which is valid.

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

Requesting review from QA contact:
/cc @qiowang721

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested a review from qiowang721 July 5, 2024 13:39
@avivtur
Copy link

avivtur commented Jul 8, 2024

/retest

1 similar comment
@upalatucci
Copy link
Author

/retest

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 12, 2024
@upalatucci
Copy link
Author

/retest

Copy link

openshift-ci bot commented Jul 12, 2024

@upalatucci: 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-sigs/prow repository. I understand the commands that are listed here.

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 15, 2024
Copy link

openshift-ci bot commented Jul 15, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: avivtur, upalatucci

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-bot openshift-merge-bot bot merged commit 7023cea into openshift:main Jul 15, 2024
3 checks passed
@openshift-ci-robot
Copy link

@upalatucci: Jira Issue OCPBUGS-36238: All pull requests linked via external trackers have merged:

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

In 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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

This PR has been included in build nmstate-console-plugin-container-v4.17.0-202407151110.p0.g7023cea.assembly.stream.el9 for distgit nmstate-console-plugin.
All builds following this will include this PR.

@upalatucci
Copy link
Author

/cherry-pick release-4.16

@openshift-cherrypick-robot

@upalatucci: new pull request created: #48

In response to this:

/cherry-pick release-4.16

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-sigs/prow repository.

@upalatucci
Copy link
Author

/cherry-pick release-4.15

@openshift-cherrypick-robot

@upalatucci: #47 failed to apply on top of branch "release-4.15":

Applying: CNV-41292: Restricted page for test user on nns
Applying: OCPBUGS-36238: STP enabled by default
Using index info to reconstruct a base tree...
M	src/utils/components/PolicyForm/PolicyForm.tsx
M	src/utils/components/PolicyForm/PolicyInterface.tsx
M	src/views/policies/new/NewPolicy.tsx
Falling back to patching base and 3-way merge...
Auto-merging src/views/policies/new/NewPolicy.tsx
Auto-merging src/utils/components/PolicyForm/PolicyInterface.tsx
CONFLICT (content): Merge conflict in src/utils/components/PolicyForm/PolicyInterface.tsx
Auto-merging src/utils/components/PolicyForm/PolicyForm.tsx
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 OCPBUGS-36238: STP enabled by default
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.15

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-sigs/prow repository.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: nmstate-console-plugin
This PR has been included in build nmstate-console-plugin-container-v4.17.0-202407191642.p0.g7023cea.assembly.stream.el9.
All builds following this will include this PR.

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. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. 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.

7 participants