Skip to content

fix packing logs in collect_pod_container_rpm_package#15139

Merged
dahorak merged 1 commit into
red-hat-storage:masterfrom
dahorak:fix-mg-logs-tar-packing
May 13, 2026
Merged

fix packing logs in collect_pod_container_rpm_package#15139
dahorak merged 1 commit into
red-hat-storage:masterfrom
dahorak:fix-mg-logs-tar-packing

Conversation

@dahorak
Copy link
Copy Markdown
Contributor

@dahorak dahorak commented May 13, 2026

This fixes a situation when DR job execution deletes previously generated MG logs from the storage.

Signed-off-by: Daniel Horak <dahorak@redhat.com>
@dahorak dahorak self-assigned this May 13, 2026
@dahorak dahorak added the team/ecosystem Ecosystem team related issues/PRs label May 13, 2026
@dahorak dahorak marked this pull request as ready for review May 13, 2026 13:57
@dahorak dahorak requested a review from a team as a code owner May 13, 2026 13:57
@dahorak
Copy link
Copy Markdown
Contributor Author

dahorak commented May 13, 2026

@dahorak dahorak added the Verified Mark when PR was verified and log provided label May 13, 2026
@dahorak
Copy link
Copy Markdown
Contributor Author

dahorak commented May 13, 2026

/cherry-pick release-4.21

@openshift-cherrypick-robot
Copy link
Copy Markdown
Collaborator

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

Details

In response to this:

/cherry-pick release-4.21

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.

@dahorak
Copy link
Copy Markdown
Contributor Author

dahorak commented May 13, 2026

/cherry-pick release-4.20

@openshift-cherrypick-robot
Copy link
Copy Markdown
Collaborator

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

Details

In response to this:

/cherry-pick release-4.20

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.

@dahorak
Copy link
Copy Markdown
Contributor Author

dahorak commented May 13, 2026

/cherry-pick release-4.19

@openshift-cherrypick-robot
Copy link
Copy Markdown
Collaborator

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

Details

In response to this:

/cherry-pick release-4.19

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.

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented May 13, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: dahorak, petr-balogh, sidhant-agrawal

The full list of commands accepted by this bot can be found 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

@dahorak dahorak merged commit 0797569 into red-hat-storage:master May 13, 2026
6 of 7 checks passed
@dahorak dahorak deleted the fix-mg-logs-tar-packing branch May 13, 2026 14:23
@openshift-cherrypick-robot
Copy link
Copy Markdown
Collaborator

@dahorak: new pull request created: #15140

Details

In response to this:

/cherry-pick release-4.21

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.

@openshift-cherrypick-robot
Copy link
Copy Markdown
Collaborator

@dahorak: new pull request created: #15141

Details

In response to this:

/cherry-pick release-4.20

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.

@openshift-cherrypick-robot
Copy link
Copy Markdown
Collaborator

@dahorak: new pull request created: #15142

Details

In response to this:

/cherry-pick release-4.19

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.

@dahorak
Copy link
Copy Markdown
Contributor Author

dahorak commented May 14, 2026

/cherry-pick release-4.18

@dahorak
Copy link
Copy Markdown
Contributor Author

dahorak commented May 14, 2026

/cherry-pick release-4.17

@dahorak
Copy link
Copy Markdown
Contributor Author

dahorak commented May 14, 2026

/cherry-pick release-4.16

@dahorak
Copy link
Copy Markdown
Contributor Author

dahorak commented May 14, 2026

/cherry-pick release-4.15

@dahorak
Copy link
Copy Markdown
Contributor Author

dahorak commented May 14, 2026

/cherry-pick release-4.14

@openshift-cherrypick-robot
Copy link
Copy Markdown
Collaborator

@dahorak: new pull request created: #15146

Details

In response to this:

/cherry-pick release-4.18

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.

@openshift-cherrypick-robot
Copy link
Copy Markdown
Collaborator

@dahorak: new pull request created: #15147

Details

In response to this:

/cherry-pick release-4.17

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.

@openshift-cherrypick-robot
Copy link
Copy Markdown
Collaborator

@dahorak: #15139 failed to apply on top of branch "release-4.16":

Applying: fix packing logs in collect_pod_container_rpm_package
Using index info to reconstruct a base tree...
M	ocs_ci/ocs/utils.py
Falling back to patching base and 3-way merge...
Auto-merging ocs_ci/ocs/utils.py
CONFLICT (content): Merge conflict in ocs_ci/ocs/utils.py
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 set advice.mergeConflict false"
Patch failed at 0001 fix packing logs in collect_pod_container_rpm_package

Details

In response to this:

/cherry-pick release-4.16

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.

@openshift-cherrypick-robot
Copy link
Copy Markdown
Collaborator

@dahorak: #15139 failed to apply on top of branch "release-4.15":

Applying: fix packing logs in collect_pod_container_rpm_package
Using index info to reconstruct a base tree...
M	ocs_ci/ocs/utils.py
Falling back to patching base and 3-way merge...
Auto-merging ocs_ci/ocs/utils.py
CONFLICT (content): Merge conflict in ocs_ci/ocs/utils.py
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 set advice.mergeConflict false"
Patch failed at 0001 fix packing logs in collect_pod_container_rpm_package

Details

In response to this:

/cherry-pick release-4.15

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.

@openshift-cherrypick-robot
Copy link
Copy Markdown
Collaborator

@dahorak: #15139 failed to apply on top of branch "release-4.14":

Applying: fix packing logs in collect_pod_container_rpm_package
Using index info to reconstruct a base tree...
M	ocs_ci/ocs/utils.py
Falling back to patching base and 3-way merge...
Auto-merging ocs_ci/ocs/utils.py
CONFLICT (content): Merge conflict in ocs_ci/ocs/utils.py
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 set advice.mergeConflict false"
Patch failed at 0001 fix packing logs in collect_pod_container_rpm_package

Details

In response to this:

/cherry-pick release-4.14

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.

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

Labels

lgtm size/XS team/ecosystem Ecosystem team related issues/PRs Verified Mark when PR was verified and log provided

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants