Skip to content

Disable pull-progress-timeout per default #9130

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
merged 1 commit into from
Apr 16, 2025
Merged

Disable pull-progress-timeout per default #9130

merged 1 commit into from
Apr 16, 2025

Conversation

@saschagrunert
Copy link
Member

What type of PR is this?

/kind api-change

What this PR does / why we need it:

Follow-up on #9108 and multiple requests to disable the timeout per default.

Which issue(s) this PR fixes:

None

Special notes for your reviewer:

None

Does this PR introduce a user-facing change?

Disabled `pull-progress-timeout` per default.

@saschagrunert saschagrunert requested a review from mrunalp as a code owner April 14, 2025 07:37
@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 Apr 14, 2025
@openshift-ci openshift-ci bot requested review from hasan4791 and klihub April 14, 2025 07:37
@openshift-ci openshift-ci bot added the kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API label Apr 14, 2025
@saschagrunert saschagrunert mentioned this pull request Apr 14, 2025
Merged
@openshift-ci openshift-ci bot added the dco-signoff: yes Indicates the PR's author has DCO signed all their commits. label Apr 14, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 14, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: saschagrunert

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 14, 2025
@saschagrunert
Disable pull-progress-timeout per default
44d9073 
Follow-up on cri-o#9108 and multiple
requests to disable the timeout per default.

Signed-off-by: Sascha Grunert <[email protected]>
@saschagrunert saschagrunert force-pushed the image-pull-timeout-disable branch from b735eed to 44d9073 Compare April 14, 2025 10:11
@codecov
Copy link

codecov bot commented Apr 14, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 47.02%. Comparing base (8b8a095) to head (44d9073).
Report is 4 commits behind head on main.

Additional details and impacted files 
@@           Coverage Diff           @@
##             main    #9130   +/-   ##
=======================================
  Coverage   47.02%   47.02%           
=======================================
  Files         161      161           
  Lines       23617    23617           
=======================================
  Hits        11105    11105           
  Misses      11414    11414           
  Partials     1098     1098
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@saschagrunert
Copy link
Member Author

/retest

@haircommander
Copy link
Member

/retest
/lgtm

this makes sense to me, the specific timeout is tricky to get right.

some history:

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 14, 2025
@saschagrunert
Copy link
Member Author

/retest

@saschagrunert
Copy link
Member Author

/cherry-pick release-1.32
/cherry-pick release-1.31
/cherry-pick release-1.30
/cherry-pick release-1.29

@openshift-cherrypick-robot
Copy link

@saschagrunert: once the present PR merges, I will cherry-pick it on top of release-1.29, release-1.30, release-1.31, release-1.32 in new PRs and assign them to you.

In response to this:

/cherry-pick release-1.32
/cherry-pick release-1.31
/cherry-pick release-1.30
/cherry-pick release-1.29

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.

@saschagrunert
Copy link
Member Author

/override ci/prow/ci-e2e-evented-pleg

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 15, 2025

@saschagrunert: Overrode contexts on behalf of saschagrunert: ci/prow/ci-e2e-evented-pleg

In response to this:

/override ci/prow/ci-e2e-evented-pleg

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.

@saschagrunert
Copy link
Member Author

/retest

3 similar comments
@saschagrunert
Copy link
Member Author

/retest

@saschagrunert
Copy link
Member Author

/retest

@saschagrunert
Copy link
Member Author

/retest

@saschagrunert
Copy link
Member Author

/override ci/prow/ci-fedora-kata

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 16, 2025

@saschagrunert: Overrode contexts on behalf of saschagrunert: ci/prow/ci-fedora-kata

In response to this:

/override ci/prow/ci-fedora-kata

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.

@saschagrunert
Copy link
Member Author

/override ci/prow/e2e-aws-ovn

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 16, 2025

@saschagrunert: Overrode contexts on behalf of saschagrunert: ci/prow/e2e-aws-ovn

In response to this:

/override ci/prow/e2e-aws-ovn

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-merge-bot openshift-merge-bot bot merged commit 592e805 into cri-o:main Apr 16, 2025
74 of 76 checks passed
@openshift-cherrypick-robot
Copy link

@saschagrunert: #9130 failed to apply on top of branch "release-1.32":

Applying: Disable pull-progress-timeout per default
Using index info to reconstruct a base tree...
M	docs/crio.8.md
M	docs/crio.conf.5.md
M	pkg/config/config.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/config/config.go
CONFLICT (content): Merge conflict in pkg/config/config.go
Auto-merging docs/crio.conf.5.md
CONFLICT (content): Merge conflict in docs/crio.conf.5.md
Auto-merging docs/crio.8.md
CONFLICT (content): Merge conflict in docs/crio.8.md
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 Disable pull-progress-timeout per default

In response to this:

/cherry-pick release-1.32
/cherry-pick release-1.31
/cherry-pick release-1.30
/cherry-pick release-1.29

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

@saschagrunert: #9130 failed to apply on top of branch "release-1.31":

Applying: Disable pull-progress-timeout per default
Using index info to reconstruct a base tree...
M	docs/crio.8.md
M	docs/crio.conf.5.md
M	pkg/config/config.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/config/config.go
CONFLICT (content): Merge conflict in pkg/config/config.go
Auto-merging docs/crio.conf.5.md
CONFLICT (content): Merge conflict in docs/crio.conf.5.md
Auto-merging docs/crio.8.md
CONFLICT (content): Merge conflict in docs/crio.8.md
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 Disable pull-progress-timeout per default

In response to this:

/cherry-pick release-1.32
/cherry-pick release-1.31
/cherry-pick release-1.30
/cherry-pick release-1.29

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

@saschagrunert: #9130 failed to apply on top of branch "release-1.30":

Applying: Disable pull-progress-timeout per default
Using index info to reconstruct a base tree...
M	docs/crio.8.md
M	docs/crio.conf.5.md
M	pkg/config/config.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/config/config.go
CONFLICT (content): Merge conflict in pkg/config/config.go
Auto-merging docs/crio.conf.5.md
CONFLICT (content): Merge conflict in docs/crio.conf.5.md
Auto-merging docs/crio.8.md
CONFLICT (content): Merge conflict in docs/crio.8.md
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 Disable pull-progress-timeout per default

In response to this:

/cherry-pick release-1.32
/cherry-pick release-1.31
/cherry-pick release-1.30
/cherry-pick release-1.29

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

@saschagrunert: #9130 failed to apply on top of branch "release-1.29":

Applying: Disable pull-progress-timeout per default
Using index info to reconstruct a base tree...
M	docs/crio.8.md
M	docs/crio.conf.5.md
M	pkg/config/config.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/config/config.go
CONFLICT (content): Merge conflict in pkg/config/config.go
Auto-merging docs/crio.conf.5.md
CONFLICT (content): Merge conflict in docs/crio.conf.5.md
Auto-merging docs/crio.8.md
CONFLICT (content): Merge conflict in docs/crio.8.md
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 Disable pull-progress-timeout per default

In response to this:

/cherry-pick release-1.32
/cherry-pick release-1.31
/cherry-pick release-1.30
/cherry-pick release-1.29

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.

@saschagrunert saschagrunert deleted the image-pull-timeout-disable branch April 16, 2025 13:25
@saschagrunert saschagrunert mentioned this pull request Apr 16, 2025
Merged
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

@hasan4791 hasan4791 Awaiting requested review from hasan4791

@klihub klihub Awaiting requested review from klihub

Assignees

@haircommander haircommander

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. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API 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.

3 participants

@saschagrunert @haircommander @openshift-cherrypick-robot