Skip to content

Conversation

copejon
Copy link
Contributor

@copejon copejon commented Jun 17, 2024

No description provided.

…rates, which triggers an error message but is not fatal. since it's desirable to sometimes fail due to an error (just not this one), the best option is to give the transfer some extra time to recover

Signed-off-by: Jon Cope <[email protected]>
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 17, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jun 17, 2024

@copejon: This pull request references USHIFT-3270 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.17.0" version, but no target version was set.

In response to this:

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.

@openshift-ci openshift-ci bot requested review from pliurh and pmtk June 17, 2024 21:11
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 17, 2024
@ggiguash
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 19, 2024
Copy link
Contributor

openshift-ci bot commented Jun 19, 2024

[APPROVALNOTIFIER] This PR is APPROVED

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

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:

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
Copy link

/retest-required

Remaining retests: 0 against base HEAD e9533cf and 2 for PR HEAD b753c6e in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 2cf0fbd and 1 for PR HEAD b753c6e in total

Copy link
Contributor

openshift-ci bot commented Jun 19, 2024

@copejon: 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-merge-bot openshift-merge-bot bot merged commit 16909c1 into openshift:main Jun 19, 2024
@copejon copejon deleted the ushift-3270 branch June 19, 2024 18:06
@copejon
Copy link
Contributor Author

copejon commented Aug 26, 2024

/cherry-pick release-4.16

@openshift-cherrypick-robot

@copejon: new pull request created: #3817

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.

@copejon
Copy link
Contributor Author

copejon commented Mar 25, 2025

/cherry-pick release-4.15

Nevermind. Another keyword in the file was renamed at some point after this patch, creating the merge conflict. Will have to submit a manual update

@openshift-cherrypick-robot

@copejon: #3500 failed to apply on top of branch "release-4.15":

Applying: installing from the local repo can sometimes experience low transfer rates, which triggers an error message but is not fatal. since it's desirable to sometimes fail due to an error (just not this one), the best option is to give the transfer some extra time to recover
Using index info to reconstruct a base tree...
M	test/resources/microshift-rpm.resource
Falling back to patching base and 3-way merge...
Auto-merging test/resources/microshift-rpm.resource
CONFLICT (content): Merge conflict in test/resources/microshift-rpm.resource
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 advice.mergeConflict false"
Patch failed at 0001 installing from the local repo can sometimes experience low transfer rates, which triggers an error message but is not fatal. since it's desirable to sometimes fail due to an error (just not this one), the best option is to give the transfer some extra time to recover

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.

copejon pushed a commit to copejon/microshift that referenced this pull request Mar 25, 2025
USHIFT-3270: Increase dnf low-bitrate timeout
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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants