Skip to content

CI: update Fedora to 43#12446

Merged
fuweid merged 1 commit intocontainerd:mainfrom
AkihiroSuda:fedora43
Oct 31, 2025
Merged

CI: update Fedora to 43#12446
fuweid merged 1 commit intocontainerd:mainfrom
AkihiroSuda:fedora43

Conversation

@AkihiroSuda
Copy link
Member

@AkihiroSuda AkihiroSuda commented Oct 31, 2025

No description provided.

@AkihiroSuda AkihiroSuda added kind/test cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch cherry-pick/2.1.x Change to be cherry picked to release/2.1 branch labels Oct 31, 2025
@github-project-automation github-project-automation bot moved this to Needs Triage in Pull Request Review Oct 31, 2025
@dosubot dosubot bot added the github_actions Pull requests that update GitHub Actions code label Oct 31, 2025
AkihiroSuda
AkihiroSuda commented Oct 31, 2025
View reviewed changes
@AkihiroSuda
CI: update Fedora to 43
e817edf 
Signed-off-by: Akihiro Suda <[email protected]>
@github-project-automation github-project-automation bot moved this from Needs Triage to Review In Progress in Pull Request Review Oct 31, 2025
@fuweid fuweid added this pull request to the merge queue Oct 31, 2025
Merged via the queue into containerd:main with commit a6fa1d7 Oct 31, 2025
95 of 96 checks passed
@github-project-automation github-project-automation bot moved this from Review In Progress to Done in Pull Request Review Oct 31, 2025
@AkihiroSuda
Copy link
Member Author

AkihiroSuda commented Oct 31, 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 31, 2025

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

Applying: CI: update Fedora to 43
Using index info to reconstruct a base tree...
M	.github/workflows/ci.yml
M	Vagrantfile
Falling back to patching base and 3-way merge...
Auto-merging Vagrantfile
CONFLICT (content): Merge conflict in Vagrantfile
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: update Fedora to 43
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 31, 2025

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

@k8s-infra-cherrypick-robot
Copy link

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

@AkihiroSuda: new pull request created: #12448

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.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Oct 31, 2025
Merged
@k8s-infra-cherrypick-robot
Copy link

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

@AkihiroSuda: new pull request created: #12449

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.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Oct 31, 2025
Merged
@AkihiroSuda AkihiroSuda added 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/2.1.x Change to be cherry picked to release/2.1 branch labels Oct 31, 2025
@AkihiroSuda AkihiroSuda mentioned this pull request Oct 31, 2025
Merged
@AkihiroSuda AkihiroSuda added cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch and removed cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels Oct 31, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@estesp estesp estesp approved these changes

@fuweid fuweid fuweid 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 github_actions Pull requests that update GitHub Actions code kind/test size/S

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 @estesp @fuweid @k8s-ci-robot