Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[release-1.25] Fix GitHub actions CI #6505

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
openshift-merge-robot merged 1 commit into from
Jan 9, 2023
Merged

[release-1.25] Fix GitHub actions CI #6505

openshift-merge-robot merged 1 commit into from
Jan 9, 2023

Conversation

@openshift-cherrypick-robot
Copy link

@openshift-cherrypick-robot openshift-cherrypick-robot commented Jan 9, 2023

This is an automated cherry-pick of #6392

/assign jrvaldes

None

@saschagrunert
Fix GitHub actions CI
51d3621 
Signed-off-by: Sascha Grunert <[email protected]>
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jan 9, 2023
Merged
@openshift-ci openshift-ci bot added release-note-none Denotes a PR that doesn't merit a release note. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Jan 9, 2023
@openshift-ci openshift-ci bot requested review from QiWang19 and wgahnagl January 9, 2023 20:21
@jrvaldes
Copy link
Contributor

jrvaldes commented Jan 9, 2023

/cherry-pick release-1.24

@openshift-cherrypick-robot
Copy link
Author

openshift-cherrypick-robot commented Jan 9, 2023

@jrvaldes: once the present PR merges, I will cherry-pick it on top of release-1.24 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-1.24

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.

@haircommander
Copy link
Member

haircommander commented Jan 9, 2023

/approve

LGTM, @cri-o/cri-o-maintainers PTAL

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 9, 2023
@jrvaldes
Copy link
Contributor

jrvaldes commented Jan 9, 2023

@cri-o/cri-o-maintainers PTAL, this is a follow-up for #6449 (comment)

@codecov
Copy link

codecov bot commented Jan 9, 2023

Codecov Report

Merging #6505 (51d3621) into release-1.25 (6005903) will decrease coverage by 0.00%.
The diff coverage is n/a.

Additional details and impacted files 
@@               Coverage Diff                @@
##           release-1.25    #6505      +/-   ##
================================================
- Coverage         43.75%   43.74%   -0.01%     
================================================
  Files               122      122              
  Lines             13660    13660              
================================================
- Hits               5977     5976       -1     
- Misses             7038     7039       +1     
  Partials            645      645

@jrvaldes jrvaldes mentioned this pull request Jan 9, 2023
Closed
mrunalp
mrunalp approved these changes Jan 9, 2023
View reviewed changes
Copy link
Member

@mrunalp mrunalp left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 9, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 9, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, mrunalp, openshift-cherrypick-robot

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [haircommander,mrunalp]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit dc1f843 into cri-o:release-1.25 Jan 9, 2023
@openshift-cherrypick-robot
Copy link
Author

openshift-cherrypick-robot commented Jan 9, 2023

@jrvaldes: #6505 failed to apply on top of branch "release-1.24":

Applying: Fix GitHub actions CI
Using index info to reconstruct a base tree...
M	.github/workflows/test.yml
M	.github/workflows/verify.yml
M	internal/factory/container/container.go
M	scripts/github-actions-packages
Falling back to patching base and 3-way merge...
Auto-merging scripts/github-actions-packages
CONFLICT (content): Merge conflict in scripts/github-actions-packages
Auto-merging internal/factory/container/container.go
Auto-merging .github/workflows/verify.yml
Auto-merging .github/workflows/test.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 Fix GitHub actions CI
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:

/cherry-pick release-1.24

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.

@jrvaldes
Copy link
Contributor

jrvaldes commented Jan 10, 2023

@jrvaldes: #6505 failed to apply on top of branch "release-1.24":

Applying: Fix GitHub actions CI
Using index info to reconstruct a base tree...
M	.github/workflows/test.yml
M	.github/workflows/verify.yml
M	internal/factory/container/container.go
M	scripts/github-actions-packages
Falling back to patching base and 3-way merge...
Auto-merging scripts/github-actions-packages
CONFLICT (content): Merge conflict in scripts/github-actions-packages
Auto-merging internal/factory/container/container.go
Auto-merging .github/workflows/verify.yml
Auto-merging .github/workflows/test.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 Fix GitHub actions CI
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".

Automatic cherry-pick failed due to the installation of criu package in

Is this something that should also be backported to release-1.24?

@jrvaldes jrvaldes mentioned this pull request Jan 10, 2023
Merged
@haircommander
Copy link
Member

haircommander commented Jan 10, 2023

no support for checkpointing was only added in 1.25 so we're good without it

@openshift-ci openshift-ci bot mentioned this pull request Apr 29, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mrunalp mrunalp mrunalp approved these changes

@runcom runcom Awaiting requested review from runcom runcom is a code owner

@QiWang19 QiWang19 Awaiting requested review from QiWang19

@wgahnagl wgahnagl Awaiting requested review from wgahnagl

Assignees

@mrunalp mrunalp

@jrvaldes jrvaldes

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@openshift-cherrypick-robot @jrvaldes @haircommander @mrunalp @openshift-merge-robot @saschagrunert