USHIFT-4518: Add retries on rebasing bootc or ostree systems

[ggiguash]

An attempt to work around ostreedev/ostree-rs-ext#657 when running tests.
Note: The problem still persists when running rebase from kickstart, but it's handled by the virt-install restart in the scenario.sh script.

[openshift-ci-robot]

@ggiguash: This pull request references USHIFT-4518 which is a valid jira issue.

In response to this:

An attempt to work around ostreedev/ostree-rs-ext#657 when running tests.
Note: The problem still persists when running rebase from kickstart.

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 openshift-eng/jira-lifecycle-plugin repository.

[ggiguash]

/cherry-pick release-4.17

[openshift-cherrypick-robot]

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

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-ci-robot]

@ggiguash: This pull request references USHIFT-4518 which is a valid jira issue.

In response to this:

An attempt to work around ostreedev/ostree-rs-ext#657 when running tests.
Note: The problem still persists when running rebase from kickstart, but it's handled by the virt-install restart in the scenario.sh script.

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 openshift-eng/jira-lifecycle-plugin repository.

[pacevedom]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ggiguash, pacevedom

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 [ggiguash,pacevedom]

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

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD fa8e7de and 2 for PR HEAD 129e34e in total

[openshift-ci]

@ggiguash: all tests passed!

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

[openshift-cherrypick-robot]

@ggiguash: #3952 failed to apply on top of branch "release-4.17":

Applying: Add retries on rebasing bootc or ostree systems
Using index info to reconstruct a base tree...
M	test/resources/ostree.resource
Falling back to patching base and 3-way merge...
Auto-merging test/resources/ostree.resource
CONFLICT (content): Merge conflict in test/resources/ostree.resource
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add retries on rebasing bootc or ostree systems
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-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.