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

Skip to content

[release-1.21] Bug 2020724: fix override storage options from storage.conf #5436

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
Dec 21, 2021
Merged

[release-1.21] Bug 2020724: fix override storage options from storage.conf #5436

openshift-merge-robot merged 1 commit into from
Dec 21, 2021

Conversation

@openshift-cherrypick-robot
Copy link

@openshift-cherrypick-robot openshift-cherrypick-robot commented Nov 4, 2021 •
edited by QiWang19
Loading

This is an automated cherry-pick of #5423
Fix: https://bugzilla.redhat.com/show_bug.cgi?id=2020724
/assign QiWang19

Merge storage_option from drop-in files to sttorage_option from storage.conf

@QiWang19
Bug 2012838: fix override storage options from storage.conf
817526d 
Fix https://bugzilla.redhat.com/show_bug.cgi?id=2012838

Merge in the storage_option from drop-in crio.conf to the storage.conf, do not override the configs from storage.conf.
The override leads to configuration of containerruntimeconfig not working.

Signed-off-by: Qi Wang <[email protected]>
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Nov 4, 2021
Merged
@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. labels Nov 4, 2021
@openshift-ci openshift-ci bot requested review from fidencio and vrothberg November 4, 2021 19:47
@codecov
Copy link

codecov bot commented Nov 4, 2021

Codecov Report

Merging #5436 (817526d) into release-1.21 (7415a53) will increase coverage by 0.08%.
The diff coverage is 100.00%.

@@               Coverage Diff                @@
##           release-1.21    #5436      +/-   ##
================================================
+ Coverage         44.89%   44.97%   +0.08%     
================================================
  Files               107      107              
  Lines             10986    11002      +16     
================================================
+ Hits               4932     4948      +16     
  Misses             5573     5573              
  Partials            481      481

@QiWang19 QiWang19 changed the title [release-1.21] Bug 2012838: fix override storage options from storage.conf [release-1.21] Bug 2020724: fix override storage options from storage.conf Nov 5, 2021
@nee1esh
Copy link

nee1esh commented Nov 29, 2021

/retest-required

1 similar comment
@lyman9966
Copy link

lyman9966 commented Dec 21, 2021

/retest-required

@QiWang19
Copy link
Member

QiWang19 commented Dec 21, 2021

@cri-o/cri-o-maintainers PTAL

@haircommander
Copy link
Member

haircommander commented Dec 21, 2021

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 21, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 21, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, 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:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 21, 2021
@openshift-bot
Copy link

openshift-bot commented Dec 21, 2021

/retest-required

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

4 similar comments
@openshift-bot
Copy link

openshift-bot commented Dec 21, 2021

/retest-required

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

@openshift-bot
Copy link

openshift-bot commented Dec 21, 2021

/retest-required

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

@openshift-bot
Copy link

openshift-bot commented Dec 21, 2021

/retest-required

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

@openshift-bot
Copy link

openshift-bot commented Dec 21, 2021

/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 Dec 21, 2021 •
edited
Loading

@openshift-cherrypick-robot: The following tests 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 817526d link false /test integration_cgroupv2
ci/openshift-jenkins/e2e_crun_cgroupv2 817526d link false /test e2e_cgroupv2

Full PR test history. Your PR dashboard.

Details

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

openshift-bot commented Dec 21, 2021

/retest-required

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

@haircommander
Copy link
Member

haircommander commented Dec 21, 2021

/override ci/openshift-jenkins/integration_crun

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 21, 2021

@haircommander: Overrode contexts on behalf of haircommander: ci/openshift-jenkins/integration_crun

Details

In response to this:

/override ci/openshift-jenkins/integration_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-merge-robot openshift-merge-robot merged commit c9f28e4 into cri-o:release-1.21 Dec 21, 2021
@openshift-ci openshift-ci bot mentioned this pull request Mar 15, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

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

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

@fidencio fidencio Awaiting requested review from fidencio

@vrothberg vrothberg Awaiting requested review from vrothberg

Assignees

@haircommander haircommander

@QiWang19 QiWang19

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 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.

7 participants

@openshift-cherrypick-robot @nee1esh @lyman9966 @QiWang19 @haircommander @openshift-bot @openshift-merge-robot