Skip to content

Enable ARM64 runner#9456

Merged
samuelkarp merged 1 commit intocontainerd:mainfrom
fuweid:enable-arm64
Dec 10, 2023
Merged

Enable ARM64 runner#9456
samuelkarp merged 1 commit intocontainerd:mainfrom
fuweid:enable-arm64

Conversation

@fuweid
Copy link
Member

@fuweid fuweid commented Dec 2, 2023 •
edited
Loading

There are many Kubernetes clusters running on ARM64. Enable ARM64 runner
is to commit to support ARM64 platform officially.

@fuweid fuweid marked this pull request as draft December 2, 2023 02:05
@fuweid fuweid force-pushed the enable-arm64 branch 2 times, most recently from dd6c42a to d1d9a72 Compare December 2, 2023 02:26
@fuweid fuweid force-pushed the enable-arm64 branch 6 times, most recently from 93f00c9 to 63f217b Compare December 4, 2023 13:33
@fuweid fuweid force-pushed the enable-arm64 branch 7 times, most recently from 8a4116c to c34e2d7 Compare December 6, 2023 01:02
@fuweid fuweid force-pushed the enable-arm64 branch 2 times, most recently from 89cedfd to bd01f72 Compare December 6, 2023 14:55
samuelkarp
samuelkarp reviewed Dec 6, 2023
View reviewed changes
@k8s-ci-robot k8s-ci-robot added size/S and removed size/M labels Dec 7, 2023
samuelkarp
samuelkarp approved these changes Dec 9, 2023
View reviewed changes
Copy link
Member

@samuelkarp samuelkarp left a comment

Choose a reason for hiding this comment

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

LGTM, but the "expected" checks are now missing because of the new OS matrix. @dmcgowan, can we adjust the "expected" checks?

@samuelkarp samuelkarp enabled auto-merge December 9, 2023 06:57
@samuelkarp samuelkarp added this pull request to the merge queue Dec 10, 2023
@dmcgowan
Copy link
Member

dmcgowan commented Dec 10, 2023

Updated the actions and temporarily removed the Linux Integration ones

Merged via the queue into containerd:main with commit 75f72d6 Dec 10, 2023
@fuweid fuweid deleted the enable-arm64 branch December 10, 2023 10:10
@alexellis
Copy link
Contributor

alexellis commented Dec 11, 2023

Question for the maintainers: #9456 (comment)

@fuweid
Copy link
Member Author

fuweid commented Dec 11, 2023

Question for the maintainers: #9456 (comment)

Commented.

@samuelkarp samuelkarp added cherry-pick/1.6.x cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels Dec 11, 2023
@samuelkarp
Copy link
Member

samuelkarp commented Dec 11, 2023

/cherrypick release/1.7
/cherrypick release/1.6

@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Dec 11, 2023

@samuelkarp: #9456 failed to apply on top of branch "release/1.7":

Applying: *: enable ARM64 runner
Using index info to reconstruct a base tree...
M	.github/workflows/ci.yml
A	mount/mount_idmapped_linux_test.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): mount/mount_idmapped_linux_test.go deleted in HEAD and modified in *: enable ARM64 runner. Version *: enable ARM64 runner of mount/mount_idmapped_linux_test.go left in tree.
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
Patch failed at 0001 *: enable ARM64 runner
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:

/cherrypick release/1.7
/cherrypick 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/test-infra repository.

@akhilerm
Copy link
Member

akhilerm commented Dec 12, 2023

/cherrypick release/1.6

@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Dec 12, 2023

@akhilerm: #9456 failed to apply on top of branch "release/1.6":

Applying: *: enable ARM64 runner
Using index info to reconstruct a base tree...
M	.github/workflows/ci.yml
A	mount/mount_idmapped_linux_test.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): mount/mount_idmapped_linux_test.go deleted in HEAD and modified in *: enable ARM64 runner. Version *: enable ARM64 runner of mount/mount_idmapped_linux_test.go left in tree.
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
Patch failed at 0001 *: enable ARM64 runner
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:

/cherrypick 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/test-infra repository.

This was referenced Dec 12, 2023
Merged
Closed
@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 cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels Dec 18, 2023
@fuweid fuweid mentioned this pull request Jan 14, 2024
Merged
@dmcgowan dmcgowan changed the title *: enable ARM64 runner Enable ARM64 runner Jan 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kzys kzys kzys approved these changes

@dmcgowan dmcgowan dmcgowan approved these changes

@samuelkarp samuelkarp samuelkarp approved these changes

@henry118 henry118 henry118 approved these changes

@akhilerm akhilerm akhilerm approved these changes

+1 more reviewer

@alexellis alexellis alexellis left review comments

Reviewers whose approvals may not affect merge requirements

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 kind/test size/S

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@fuweid @dmcgowan @alexellis @samuelkarp @k8s-infra-cherrypick-robot @akhilerm @kzys @henry118 @k8s-ci-robot