Skip to content

Disable criu test on arm64#11707

Merged
fuweid merged 3 commits intocontainerd:mainfrom
estesp:disable-criu-test-on-arm
Apr 16, 2025
Merged

Disable criu test on arm64#11707
fuweid merged 3 commits intocontainerd:mainfrom
estesp:disable-criu-test-on-arm

Conversation

@estesp
Copy link
Member

@estesp estesp commented Apr 16, 2025

Also cherry-picked the commits from #11706 to see if we can get a clean CI run

@github-project-automation github-project-automation bot moved this to Needs Triage in Pull Request Review Apr 16, 2025
@dosubot dosubot bot added area/criu checkpoint/resume area/github_actions Pull requests that update GitHub Actions code labels Apr 16, 2025
akhilerm added 2 commits April 16, 2025 16:23
@akhilerm @estesp
add option to skip tests in critest
8e6c93b 
Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
(cherry picked from commit 4ba3d82)
@akhilerm @estesp
disable portmap test in ubuntu-22 to make CI happy
70db1bd 
Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
(cherry picked from commit 338e0a1)
@estesp estesp force-pushed the disable-criu-test-on-arm branch 2 times, most recently from 69b8a9f to ae96dc5 Compare April 16, 2025 20:31
@estesp
Copy link
Member Author

estesp commented Apr 16, 2025

/cc @akhilerm

@k8s-ci-robot k8s-ci-robot requested a review from akhilerm April 16, 2025 20:32
@dmcgowan
Copy link
Member

dmcgowan commented Apr 16, 2025

panic: failed to check for criu version: exec: "criu": executable file not found in $PATH

Also skip for Checkpoint/Restore via CRI when not installed, seems those don't auto skip

@estesp
Disable arm64 criu testing in GH Actions
9ca6a7e 
Due to current 100% failure rate on arm64 with the current OS image, disable criu testing for now

Signed-off-by: Phil Estes <estesp@amazon.com>
@estesp estesp force-pushed the disable-criu-test-on-arm branch from ae96dc5 to 9ca6a7e Compare April 16, 2025 21:09
@estesp
Copy link
Member Author

estesp commented Apr 16, 2025

panic: failed to check for criu version: exec: "criu": executable file not found in $PATH

Also skip for Checkpoint/Restore via CRI when not installed, seems those don't auto skip

yup; fixed. For some reason I thought that script did existence check

@estesp estesp moved this from Needs Triage to Needs Reviewers in Pull Request Review Apr 16, 2025
@dmcgowan
Copy link
Member

dmcgowan commented Apr 16, 2025

Green!

@github-project-automation github-project-automation bot moved this from Needs Reviewers to Review In Progress in Pull Request Review Apr 16, 2025
@fuweid fuweid added this pull request to the merge queue Apr 16, 2025
Merged via the queue into containerd:main with commit 2ab9d68 Apr 16, 2025
99 of 102 checks passed
@github-project-automation github-project-automation bot moved this from Review In Progress to Done in Pull Request Review Apr 16, 2025
@dmcgowan
Copy link
Member

dmcgowan commented Apr 16, 2025 •
edited
Loading

/cherrypick release/2.0

@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Apr 16, 2025

@dmcgowan: #11707 failed to apply on top of branch "release/2.0":

Applying: add option to skip tests in critest
Applying: disable portmap test in ubuntu-22 to make CI happy
Using index info to reconstruct a base tree...
M	.github/workflows/ci.yml
Falling back to patching base and 3-way merge...
Auto-merging .github/workflows/ci.yml
Applying: Disable arm64 criu testing in GH Actions
Using index info to reconstruct a base tree...
M	.github/workflows/ci.yml
Falling back to patching base and 3-way merge...
Auto-merging .github/workflows/ci.yml
CONFLICT (content): Merge conflict in .github/workflows/ci.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0003 Disable arm64 criu testing in GH Actions
Details

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.

This was referenced Apr 16, 2025
Merged
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dmcgowan dmcgowan dmcgowan approved these changes

@fuweid fuweid fuweid approved these changes

@akhilerm akhilerm Awaiting requested review from akhilerm

Assignees

No one assigned

Labels

area/criu checkpoint/resume area/github_actions Pull requests that update GitHub Actions code size/S

Projects

Pull Request Review
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@estesp @dmcgowan @k8s-infra-cherrypick-robot @fuweid @k8s-ci-robot @akhilerm