Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[1.20] server: use background context for network stop #4817

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
Merged
openshift-merge-robot merged 1 commit into from
Apr 27, 2021
Merged

[1.20] server: use background context for network stop #4817

openshift-merge-robot merged 1 commit into from
Apr 27, 2021

Conversation

@haircommander
Copy link
Member

@haircommander haircommander commented Apr 27, 2021

What type of PR is this?

/kind api-change
/kind bug
/kind ci
/kind cleanup
/kind dependency-change
/kind deprecation
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake
/kind other

What this PR does / why we need it:

or else the cleanup will always fail on cleanup from context deadline

Signed-off-by: Peter Hunt [email protected]

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

none

@haircommander
server: use background context for network stop
74fe249 
or else the cleanup will always fail on cleanup from context deadline

Signed-off-by: Peter Hunt <[email protected]>
@openshift-ci-robot openshift-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/bug Categorizes issue or PR as related to a bug. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Apr 27, 2021
@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 27, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander

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

The pull request process is described here

Details 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 Apr 27, 2021
@codecov
Copy link

codecov bot commented Apr 27, 2021

Codecov Report

Merging #4817 (74fe249) into release-1.20 (f1d5201) will not change coverage.
The diff coverage is 0.00%.

@@              Coverage Diff              @@
##           release-1.20    #4817   +/-   ##
=============================================
  Coverage         40.90%   40.90%           
=============================================
  Files               117      117           
  Lines              9555     9555           
=============================================
  Hits               3908     3908           
  Misses             5195     5195           
  Partials            452      452

@haircommander
Copy link
Member Author

haircommander commented Apr 27, 2021

/override ci/openshift-jenkins/critest_fedora
/override ci/openshift-jenkins/critest_rhel

@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 27, 2021

@haircommander: Overrode contexts on behalf of haircommander: ci/openshift-jenkins/critest_fedora, ci/openshift-jenkins/critest_rhel

Details

In response to this:

/override ci/openshift-jenkins/critest_fedora
/override ci/openshift-jenkins/critest_rhel

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.

@mrunalp
Copy link
Member

mrunalp commented Apr 27, 2021

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 27, 2021
@openshift-bot
Copy link

openshift-bot commented Apr 27, 2021

/retest

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

@haircommander
Copy link
Member Author

haircommander commented Apr 27, 2021

/override ci/openshift-jenkins/critest_fedora
/override ci/openshift-jenkins/critest_rhel

@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 27, 2021

@haircommander: Overrode contexts on behalf of haircommander: ci/openshift-jenkins/critest_fedora, ci/openshift-jenkins/critest_rhel

Details

In response to this:

/override ci/openshift-jenkins/critest_fedora
/override ci/openshift-jenkins/critest_rhel

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

openshift-bot commented Apr 27, 2021

/retest

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

2 similar comments
@openshift-bot
Copy link

openshift-bot commented Apr 27, 2021

/retest

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

@openshift-bot
Copy link

openshift-bot commented Apr 27, 2021

/retest

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

@openshift-merge-robot openshift-merge-robot merged commit a2f05e3 into cri-o:release-1.20 Apr 27, 2021
@haircommander
Copy link
Member Author

haircommander commented May 5, 2021

/cherry-pick release-1.21

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented May 5, 2021

@haircommander: #4817 failed to apply on top of branch "release-1.21":

Applying: server: use background context for network stop
Using index info to reconstruct a base tree...
M	server/sandbox_run_linux.go
Falling back to patching base and 3-way merge...
Auto-merging server/sandbox_run_linux.go
CONFLICT (content): Merge conflict in server/sandbox_run_linux.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 server: use background context for network stop
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".
Details

In response to this:

/cherry-pick release-1.21

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.

@haircommander haircommander mentioned this pull request May 5, 2021
Closed
@openshift-ci openshift-ci bot mentioned this pull request Aug 30, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mrunalp mrunalp Awaiting requested review from mrunalp mrunalp is a code owner

@runcom runcom Awaiting requested review from runcom runcom is a code owner

@giuseppe giuseppe Awaiting requested review from giuseppe

@sameo sameo Awaiting requested review from sameo

Assignees

@mrunalp mrunalp

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@haircommander @openshift-ci-robot @mrunalp @openshift-bot @openshift-cherrypick-robot @openshift-merge-robot