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

Automated cherry pick of #100200: respect ExecProbeTimeout and #101006: exec test should not run in Parallel #101127

Merged
merged 2 commits into from
Apr 22, 2021
Merged

Automated cherry pick of #100200: respect ExecProbeTimeout and #101006: exec test should not run in Parallel #101127

merged 2 commits into from
Apr 22, 2021

Conversation

jackfrancis
Copy link
Contributor

@jackfrancis jackfrancis commented Apr 14, 2021 •
edited by liggitt
Loading

Cherry pick of #100200 and #101006 on release-1.21.

#100200: respect ExecProbeTimeout
#101006: exec test should not run in Parallel as feature gate is not locked yet

For details on the cherry pick process, see the cherry pick requests page.

respect ExecProbeTimeout=false for dockershim

@jackfrancis jackfrancis force-pushed the automated-cherry-pick-of-#100200-upstream-release-1.21 branch from 1c2f342 to e58f5ff Compare April 14, 2021 20:54
@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Apr 14, 2021
@k8s-ci-robot k8s-ci-robot added do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Apr 14, 2021
@k8s-ci-robot k8s-ci-robot added area/test sig/node Categorizes an issue or PR as relevant to SIG Node. sig/testing Categorizes an issue or PR as relevant to SIG Testing. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Apr 14, 2021
@jackfrancis jackfrancis mentioned this pull request Apr 14, 2021
Closed
@SergeyKanzhelev
Copy link
Member

/triage accepted
/priority important-soon
/kind bug
/lgtm

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. kind/bug Categorizes issue or PR as related to a bug. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Apr 15, 2021
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 15, 2021
@jackfrancis
Copy link
Contributor Author

For the record, this cherry-pick PR includes two PRs:

@k8s-ci-robot k8s-ci-robot added the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Apr 15, 2021
@jackfrancis jackfrancis changed the title Automated cherry pick of #100200: respect ExecProbeTimeout Automated cherry pick of #100200: respect ExecProbeTimeout and #101006: exec test should not run in Parallel Apr 15, 2021
@jackfrancis jackfrancis mentioned this pull request Apr 15, 2021
Merged
@liggitt
Copy link
Member

liggitt commented Apr 20, 2021

/assign @dchen1107
for original approve

#100200 (comment)

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Apr 20, 2021
@matthyx
Copy link
Contributor

matthyx commented Apr 20, 2021

/uncc

@k8s-ci-robot k8s-ci-robot removed the request for review from matthyx April 20, 2021 14:48
@dchen1107
Copy link
Member

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 20, 2021
hasheddan
hasheddan approved these changes Apr 22, 2021
View reviewed changes
Copy link
Contributor

@hasheddan hasheddan left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dchen1107, hasheddan, jackfrancis

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

@hasheddan hasheddan added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Apr 22, 2021
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Apr 22, 2021
@jackfrancis
Copy link
Contributor Author

/retest

@k8s-ci-robot k8s-ci-robot merged commit d906e15 into kubernetes:release-1.21 Apr 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hasheddan hasheddan hasheddan approved these changes

@feiskyer feiskyer Awaiting requested review from feiskyer

Assignees

@dchen1107 dchen1107

@SergeyKanzhelev SergeyKanzhelev

@hasheddan hasheddan

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubelet area/test cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Node CI/Test Board
Archived in project
SIG Node: code and documentation PRs
Archived in project
Milestone
v1.21
Development

Successfully merging this pull request may close these issues.
8 participants
@jackfrancis @SergeyKanzhelev @liggitt @matthyx @dchen1107 @k8s-ci-robot @hasheddan @pacoxu