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

Skip to content

Conversation

@openshift-cherrypick-robot
Copy link

@openshift-cherrypick-robot openshift-cherrypick-robot commented Nov 4, 2021

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

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

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-ci openshift-ci bot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Nov 4, 2021
@openshift-ci openshift-ci bot added the dco-signoff: yes Indicates the PR's author has DCO signed all their commits. label Nov 4, 2021
@openshift-ci openshift-ci bot requested review from fidencio and rhatdan November 4, 2021 20:09
@codecov
Copy link

codecov bot commented Nov 4, 2021

Codecov Report

Merging #5437 (da15bc2) into release-1.22 (d745cab) will increase coverage by 0.05%.
The diff coverage is 100.00%.

❗ Current head da15bc2 differs from pull request most recent head 361acb4. Consider uploading reports for the commit 361acb4 to get more accurate results

@@               Coverage Diff                @@
##           release-1.22    #5437      +/-   ##
================================================
+ Coverage         43.68%   43.74%   +0.05%     
================================================
  Files               118      118              
  Lines             11751    11767      +16     
================================================
+ Hits               5133     5147      +14     
- Misses             6130     6131       +1     
- Partials            488      489       +1     

@QiWang19 QiWang19 changed the title [release-1.22] Bug 2012838: fix override storage options from storage.conf [release-1.22] Bug 2020729: fix override storage options from storage.conf Nov 5, 2021
@haircommander
Copy link
Member

/retest
/approve
/lgtm

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

openshift-ci bot commented Nov 23, 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 Nov 23, 2021
@openshift-bot
Copy link

/retest-required

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

1 similar comment
@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 Nov 23, 2021

@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 361acb4 link false /test integration_cgroupv2
ci/openshift-jenkins/e2e_crun_cgroupv2 361acb4 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

/retest-required

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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

Development

Successfully merging this pull request may close these issues.

5 participants