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.

Sign up for GitHub

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

Jump to bottom

OCPBUGS-10796: [release-4.13] Egress firewall fix retry #1602

Merged
merged 3 commits into from
Mar 28, 2023
Merged

OCPBUGS-10796: [release-4.13] Egress firewall fix retry #1602

merged 3 commits into from
Mar 28, 2023

Conversation

npinaeva
Copy link
Member

backport of ovn-org/ovn-kubernetes#3449 (clean!)
downstream merge #1574

@npinaeva
Egress firewall creation error was overridden by the status update
2e3d170 
error and never returned. That would prevent retry on failure.

Signed-off-by: Nadia Pinaeva <npinaeva@redhat.com>
(cherry picked from commit 66c8801)
@npinaeva
Fix egress firewall unit tests gatewayMode setup
362fa55 
update "egress firewall with node selector updates during node update"
to work for both gateway modes.

Signed-off-by: Nadia Pinaeva <npinaeva@redhat.com>
(cherry picked from commit 26f8f66)
@npinaeva
fix multiple error aggregation: errors.Wrapf always returns nil if the
74f95e9 
first argument is nil.

Signed-off-by: Nadia Pinaeva <npinaeva@redhat.com>
(cherry picked from commit 11283d6)
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 23, 2023

@npinaeva: 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:

OCPBUGS-10796: [release-4.13] Egress firewall fix retry

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 jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Mar 23, 2023
@openshift-ci-robot
Copy link
Contributor

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

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.13.0) matches configured target version for branch (4.13.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-7988 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-7988 targets the "4.14.0" version, which is one of the valid target versions: 4.14.0
  • bug has dependents

Requesting review from QA contact:
/cc @huiran0826

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

In response to this:

backport of ovn-org/ovn-kubernetes#3449 (clean!)
downstream merge #1574

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.

@npinaeva
Copy link
Member Author

/cherry-pick 4.12

@openshift-cherrypick-robot
Copy link

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

In response to this:

/cherry-pick 4.12

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.

trozet
trozet approved these changes Mar 23, 2023
View reviewed changes
Copy link
Contributor

@trozet trozet left a comment

Choose a reason for hiding this comment

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

/lgtm

@trozet
Copy link
Contributor

trozet commented Mar 23, 2023

/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Mar 23, 2023
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 23, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 23, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: npinaeva, trozet

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 23, 2023
@jechen0648
Copy link

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Mar 23, 2023
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD d166f81 and 2 for PR HEAD 74f95e9 in total

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 4a93ea3 and 1 for PR HEAD 74f95e9 in total

@dcbw
Copy link
Contributor

dcbw commented Mar 24, 2023

/test e2e-metal-ipi-ovn-dualstack

image mirror issue, not networking

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD ebb5dca and 0 for PR HEAD 74f95e9 in total

@openshift-ci-robot
Copy link
Contributor

/hold

Revision 74f95e9 was retested 3 times: holding

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 24, 2023
@npinaeva
Copy link
Member Author

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 27, 2023
@npinaeva
Copy link
Member Author

/retest-required

1 similar comment
@npinaeva
Copy link
Member Author

/retest-required

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD ebb5dca and 2 for PR HEAD 74f95e9 in total

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 27, 2023 •
edited
Loading

@npinaeva: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-openstack-ovn 74f95e9 link false /test e2e-openstack-ovn
ci/prow/e2e-ovn-hybrid-step-registry 74f95e9 link false /test e2e-ovn-hybrid-step-registry
ci/prow/e2e-aws-ovn-hypershift 74f95e9 link false /test e2e-aws-ovn-hypershift
ci/prow/e2e-vsphere-ovn 74f95e9 link false /test e2e-vsphere-ovn

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.

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD cb89e52 and 1 for PR HEAD 74f95e9 in total

@jechen0648
Copy link

/ocpbugs cc-qa

@jechen0648
Copy link

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Mar 27, 2023
@openshift-merge-robot openshift-merge-robot merged commit 9799fbc into openshift:release-4.13 Mar 28, 2023
@openshift-ci-robot
Copy link
Contributor

@npinaeva: Jira Issue OCPBUGS-10796: All pull requests linked via external trackers have merged:

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

In response to this:

backport of ovn-org/ovn-kubernetes#3449 (clean!)
downstream merge #1574

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
Copy link

@npinaeva: cannot checkout 4.12: error checking out 4.12: exit status 1. output: error: pathspec '4.12' did not match any file(s) known to git

In response to this:

/cherry-pick 4.12

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.

@npinaeva npinaeva deleted the ocpbugs-10796 branch March 28, 2023 08:03
@npinaeva
Copy link
Member Author

/cherry-pick release-4.12

@openshift-cherrypick-robot
Copy link

@npinaeva: #1602 failed to apply on top of branch "release-4.12":

Applying: Egress firewall creation error was overridden by the status update error and never returned. That would prevent retry on failure.
Using index info to reconstruct a base tree...
A	go-controller/pkg/ovn/default_network_controller.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): go-controller/pkg/ovn/default_network_controller.go deleted in HEAD and modified in Egress firewall creation error was overridden by the status update error and never returned. That would prevent retry on failure.. Version Egress firewall creation error was overridden by the status update error and never returned. That would prevent retry on failure. of go-controller/pkg/ovn/default_network_controller.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Egress firewall creation error was overridden by the status update error and never returned. That would prevent retry on failure.
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.12

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.

@npinaeva npinaeva mentioned this pull request Mar 28, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@trozet trozet trozet approved these changes

@huiran0826 huiran0826 Awaiting requested review from huiran0826

@abhat abhat Awaiting requested review from abhat

@dcbw dcbw Awaiting requested review from dcbw

Assignees

@mffiedler mffiedler

@rbbratta rbbratta

@zhaozhanqi zhaozhanqi

@weliang1 weliang1

@anuragthehatter anuragthehatter

@huiran0826 huiran0826

@asood-rh asood-rh

@jechen0648 jechen0648

@yingwang-0320 yingwang-0320

@qiowang721 qiowang721

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. 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. 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. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.