UPSTREAM: openshift/source-to-image: 576: increase default docker tim…#10675
UPSTREAM: openshift/source-to-image: 576: increase default docker tim…#10675openshift-bot merged 1 commit intoopenshift:masterfrom
Conversation
|
[test] |
| // DefaultDockerTimeout specifies a timeout for Docker API calls. When this | ||
| // timeout is reached, certain Docker API calls might error out. | ||
| DefaultDockerTimeout = 20 * time.Second | ||
| DefaultDockerTimeout = 60 * time.Second |
|
Evaluated for origin test up to 5820bb8 |
|
@deads2k you ok w/ the commit syntax? we don't actually have an upstream commit to reference because this isn't the exact change we're going to put into s2i. @gabemontero alternatively we can do a separate PR to s2i to make the timeout change and reference it here, for completeness. |
|
I'll refactor the existing s2i pull to only do the timeout change |
Yes, looks fine. |
|
continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/8492/) |
|
s2i pull 526 refactored to exactly match this one, and it has merged |
|
@gabemontero can you change the commit text to reference the actual upstream commit now that there is one? |
|
@bparees based on what I read in the scripts/validation code, and looking at recent UPSTREAM examples, you just point to the PR number for these UPSTREAM guys. I think the text is good to go. |
|
my bad. |
|
continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/8492/) (Image: devenv-rhel7_4939) |
|
Evaluated for origin merge up to 5820bb8 |
4 participants
…eout
per hall chat with @bparees , @deads2k, and myself, followed by devexp scrum discussion his AM, this is a s2i upstream merge of the no-risk, bump the default docker timeout, portion of the fix for bugzilla 1370265 that is being driven by s2i pull 576.
This commit passed
make verifyandhack/verify-upstream-commits.sh@bparees @csrwng @deads2k PTAL
and of course, if we change our mind and don't want to bother with even this portion of the fix for 3.3, I can nuke this pr.
thanks