Skip to content
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

do not wipe images by default #6022

Merged
merged 2 commits into from
Jul 4, 2022
Merged

do not wipe images by default #6022

merged 2 commits into from
Jul 4, 2022

Conversation

haircommander
Copy link
Member

What type of PR is this?

/kind bug

What this PR does / why we need it:

many users don't want the crio wipe functionality that removes images on reboot. Update internal wipe to not do so by default

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Update `version-file-persist` to be empty by default, and do not wipe images when it is so.

@openshift-ci openshift-ci bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/bug Categorizes issue or PR as related to a bug. labels Jun 30, 2022
@openshift-ci openshift-ci bot requested review from QiWang19 and wgahnagl June 30, 2022 17:39
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 30, 2022
@haircommander
Copy link
Member Author

fixes #5352

@haircommander haircommander mentioned this pull request Jun 30, 2022
Closed
@haircommander
version: don't wipe if filename is empty
935652c 
Signed-off-by: Peter Hunt <pehunt@redhat.com>
@haircommander
config: set version-file-persist to empty by default
f03e563 
Signed-off-by: Peter Hunt <pehunt@redhat.com>
@codecov
Copy link

codecov bot commented Jun 30, 2022

Codecov Report

Merging #6022 (f03e563) into main (ceaadc4) will decrease coverage by 0.03%.
The diff coverage is 83.33%.

@@            Coverage Diff             @@
##             main    #6022      +/-   ##
==========================================
- Coverage   42.74%   42.70%   -0.04%     
==========================================
  Files         119      119              
  Lines       12620    12623       +3     
==========================================
- Hits         5394     5391       -3     
- Misses       6705     6708       +3     
- Partials      521      524       +3

@TomSweeneyRedHat
Copy link
Contributor

LGTM
assuming happy tests

saschagrunert
saschagrunert approved these changes Jul 4, 2022
View reviewed changes
Copy link
Member

@saschagrunert saschagrunert 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 Jul 4, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 4, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, saschagrunert

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

The pull request process is described here

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

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

@saschagrunert
Copy link
Member

/retest-required

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

2 similar comments
@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 4, 2022 •
edited
Loading

@haircommander: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/openshift-jenkins/integration_crun_cgroupv2 f03e563 link false /test integration_cgroupv2

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

4 similar comments
@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

13 similar comments
@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@saschagrunert
Copy link
Member

/override ci/openshift-jenkins/e2e_crun

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 4, 2022

@saschagrunert: Overrode contexts on behalf of saschagrunert: ci/openshift-jenkins/e2e_crun

In response to this:

/override ci/openshift-jenkins/e2e_crun

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.

@openshift-ci openshift-ci bot merged commit dde23c5 into cri-o:main Jul 4, 2022
@haircommander haircommander mentioned this pull request Aug 16, 2022
Closed
@wgahnagl wgahnagl mentioned this pull request Dec 2, 2022
Closed
This was referenced Dec 13, 2022
Closed
Closed
@jrvaldes
Copy link
Contributor

/cherry-pick release-1.24

@openshift-cherrypick-robot
Copy link

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

Applying: version: don't wipe if filename is empty
Using index info to reconstruct a base tree...
M	internal/version/version.go
M	internal/version/version_test.go
Falling back to patching base and 3-way merge...
Auto-merging internal/version/version_test.go
Auto-merging internal/version/version.go
CONFLICT (content): Merge conflict in internal/version/version.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 version: don't wipe if filename is empty
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".

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 jrvaldes mentioned this pull request Jan 10, 2023
Merged
@sohankunkerkar sohankunkerkar mentioned this pull request Jan 9, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@saschagrunert saschagrunert saschagrunert approved these changes

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

@runcom runcom Awaiting requested review from runcom

@QiWang19 QiWang19 Awaiting requested review from QiWang19

@wgahnagl wgahnagl Awaiting requested review from wgahnagl

Assignees

@saschagrunert saschagrunert

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. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@haircommander @TomSweeneyRedHat @saschagrunert @openshift-bot @jrvaldes @openshift-cherrypick-robot