Skip to content

CI: skip ubuntu-24.04-arm on private repos #12419

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
dmcgowan merged 1 commit into from
Oct 27, 2025
Merged

CI: skip ubuntu-24.04-arm on private repos #12419

dmcgowan merged 1 commit into from
Oct 27, 2025

Conversation

@AkihiroSuda
Copy link
Member

@AkihiroSuda AkihiroSuda commented Oct 27, 2025

ubuntu-24.04-arm runners are not available for private repositories.

@AkihiroSuda AkihiroSuda added kind/test 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 Oct 27, 2025
@github-project-automation github-project-automation bot moved this to Needs Triage in Pull Request Review Oct 27, 2025
@AkihiroSuda AkihiroSuda added the cherry-pick/2.1.x Change to be cherry picked to release/2.1 branch label Oct 27, 2025
@dosubot dosubot bot added the github_actions Pull requests that update GitHub Actions code label Oct 27, 2025
@AkihiroSuda AkihiroSuda marked this pull request as draft October 27, 2025 16:46
@AkihiroSuda
CI: skip ubuntu-24.04-arm on private repos
c59cc44 
ubuntu-24.04-arm runners are not available for private repositories.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@AkihiroSuda AkihiroSuda force-pushed the ci-skip-arm-on-private branch from 8c90f1f to c59cc44 Compare October 27, 2025 16:49
@AkihiroSuda AkihiroSuda marked this pull request as ready for review October 27, 2025 16:55
@AkihiroSuda AkihiroSuda added the easy-to-review Easy to review label Oct 27, 2025
@github-project-automation github-project-automation bot moved this from Needs Triage to Review In Progress in Pull Request Review Oct 27, 2025
@dmcgowan dmcgowan added this pull request to the merge queue Oct 27, 2025
Merged via the queue into containerd:main with commit c46ff48 Oct 27, 2025
54 checks passed
@github-project-automation github-project-automation bot moved this from Review In Progress to Done in Pull Request Review Oct 27, 2025
@AkihiroSuda
Copy link
Member Author

AkihiroSuda commented Oct 27, 2025

/cherry-pick release/2.1
/cherry-pick release/2.0
/cherry-pick release/1.7

@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Oct 27, 2025

@AkihiroSuda: #12419 failed to apply on top of branch "release/1.7":

Applying: CI: skip ubuntu-24.04-arm on private repos
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 0001 CI: skip ubuntu-24.04-arm on private repos
Details

In response to this:

/cherry-pick release/2.1
/cherry-pick release/2.0
/cherry-pick release/1.7

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.

@AkihiroSuda
Copy link
Member Author

AkihiroSuda commented Oct 28, 2025

/cherry-pick release/2.1
/cherry-pick release/2.0

@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Oct 28, 2025

@AkihiroSuda: #12419 failed to apply on top of branch "release/2.0":

Applying: CI: skip ubuntu-24.04-arm on private repos
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 0001 CI: skip ubuntu-24.04-arm on private repos
Details

In response to this:

/cherry-pick release/2.1
/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.

@AkihiroSuda
Copy link
Member Author

AkihiroSuda commented Oct 28, 2025

/cherry-pick release/2.1

@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Oct 28, 2025

@AkihiroSuda: #12419 failed to apply on top of branch "release/2.1":

Applying: CI: skip ubuntu-24.04-arm on private repos
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 0001 CI: skip ubuntu-24.04-arm on private repos
Details

In response to this:

/cherry-pick release/2.1

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 Oct 28, 2025
Merged
Merged
Merged
@AkihiroSuda AkihiroSuda added 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 cherry-picked/2.1.x PR commits are cherry picked into the release/2.1 branch and removed 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 cherry-pick/2.1.x Change to be cherry picked to release/2.1 branch labels Oct 28, 2025
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

@mxpv mxpv mxpv approved these changes

Assignees

No one assigned

Labels

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 cherry-picked/2.1.x PR commits are cherry picked into the release/2.1 branch easy-to-review Easy to review github_actions Pull requests that update GitHub Actions code kind/test size/XS

Projects

Pull Request Review
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@AkihiroSuda @k8s-infra-cherrypick-robot @dmcgowan @mxpv @k8s-ci-robot