deploy: revert proportional recreate timeout and default to 10m#12259
Merged
openshift-bot merged 1 commit intoopenshift:masterfrom Dec 16, 2016
Merged
deploy: revert proportional recreate timeout and default to 10m#12259openshift-bot merged 1 commit intoopenshift:masterfrom
openshift-bot merged 1 commit intoopenshift:masterfrom
Conversation
Contributor
Author
|
[test] @Kargakis PTAL |
Contributor
|
@mfojtik thanks, lgtm [merge] |
0xmichalis
approved these changes
Dec 14, 2016
Contributor
|
Evaluated for origin test up to fb84a4c |
Contributor
|
continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/12376/) (Base Commit: ec9ff39) |
Contributor
Author
|
flake: #10228 [merge] |
Contributor
Author
|
flake: #12184 [merge] |
Contributor
|
Evaluated for origin merge up to fb84a4c |
Contributor
|
continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/12448/) (Base Commit: 4cb1ce3) (Image: devenv-rhel7_5555) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR reverts the proportional timeout (accounting the deployer pod start time) as we don't need that since we count timeout for each operation that makes progress. Also this bumps the default timeout for this in recreate from 2m to 10m.