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

e2e: use the shim bundled with containerd artifact #11489

Merged
merged 1 commit into from
Mar 6, 2025
Merged

e2e: use the shim bundled with containerd artifact #11489

merged 1 commit into from
Mar 6, 2025

Conversation

akhilerm
Copy link
Member

@akhilerm akhilerm commented Mar 6, 2025

use the shim bundled with cri-cni-containerd tar rather than using the shim present on the host machine for running e2e

Fixes: kubernetes/kubernetes#130590

@akhilerm
e2e: use the shim bundled with containerd artifact
393ad5b 
use the shim bundled with cri-cni-containerd tar rather than using
the shim present on the host machine for running e2e

Signed-off-by: Akhil Mohan <[email protected]>
@akhilerm akhilerm added cherry-pick/1.6.x Change to be cherry picked to release/1.6 branch cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch cherry-pick/2.0.x Change to be cherry picked to release/2.0 branch and removed size/XS labels Mar 6, 2025
@akhilerm akhilerm requested a review from samuelkarp March 6, 2025 03:56
@samuelkarp samuelkarp enabled auto-merge March 6, 2025 04:03
@samuelkarp samuelkarp added this pull request to the merge queue Mar 6, 2025
Merged via the queue into containerd:main with commit ea558e0 Mar 6, 2025
58 checks passed
@akhilerm akhilerm deleted the e2e-fix-runtime-path branch March 6, 2025 05:15
@akhilerm
Copy link
Member Author

akhilerm commented Mar 6, 2025

/cherry-pick release/2.0

@akhilerm
Copy link
Member Author

akhilerm commented Mar 6, 2025

/cherry-pick release/1.7
/cherry-pick release/1.6

@k8s-infra-cherrypick-robot
Copy link

@akhilerm: new pull request created: #11490

In response to this:

/cherry-pick release/2.0

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.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Mar 6, 2025
Closed
@k8s-infra-cherrypick-robot
Copy link

@akhilerm: new pull request created: #11491

In response to this:

/cherry-pick release/1.7
/cherry-pick release/1.6

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.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Mar 6, 2025
Closed
@k8s-infra-cherrypick-robot
Copy link

@akhilerm: new pull request created: #11492

In response to this:

/cherry-pick release/1.7
/cherry-pick release/1.6

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.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Mar 6, 2025
Closed
This was referenced Mar 6, 2025
Merged
Merged
@akhilerm
Copy link
Member Author

akhilerm commented Mar 7, 2025

/cherry-pick release/2.0

@akhilerm akhilerm added cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch and removed cherry-pick/1.6.x Change to be cherry picked to release/1.6 branch cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch cherry-pick/2.0.x Change to be cherry picked to release/2.0 branch labels Mar 7, 2025
@akhilerm akhilerm added the cherry-picked/2.0.x PR commits are cherry picked into the release/2.0 branch label Mar 7, 2025
@k8s-infra-cherrypick-robot
Copy link

@akhilerm: new pull request created: #11503

In response to this:

/cherry-pick release/2.0

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.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Mar 7, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@samuelkarp samuelkarp samuelkarp approved these changes

@djdongjin djdongjin djdongjin approved these changes

Assignees
No one assigned
Labels
cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch cherry-picked/2.0.x PR commits are cherry picked into the release/2.0 branch
Projects
Pull Request Review
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Failing Test] [sig-node] containerd-node-e2e-1-6/7 are failing
5 participants
@akhilerm @k8s-infra-cherrypick-robot @samuelkarp @djdongjin @k8s-ci-robot