[JENKINS-6933] Handle proxy settings #72
Merged
Conversation
This file contains 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
Subclasses of AbstractCallableCommand will need access to the WebProxySettings to relay to the Server instances they create.
According to https://issues.jenkins-ci.org/browse/JENKINS-20223?focusedCommentId=188427&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-188427 it is not possible to obtain the Jenkins instance from a node, so we go through the remoting channel instead.
These accept an optional ProxyHost instance to configure HttpClient instances with the appropriate web proxy settings.
If a proxy server has been configured in Jenkins and the TFS/VSTS server is not an excluded host, the ModernConnectionAdvisor and ModernHTTPClientFactory will make sure the HttpClient instances are configured appropriately.
This proxy server is scoped to "test"
This will make it possible to verify that the proxy server was used.
AbsractProject#poll() (in version 1.448) would only try to catch AbortException, IOException and InterruptedException. It may be worth expanding the reach of the try..catch in compareRemoteRevisionWith() to catch any other programming error to make them more visible without risking breaking polling on a Jenkins server.
As the name implies, this verifies that the TFS plugin will use the proxy server configured in Jenkins itself. Notice that the test set-up is able to proceed without going through the web proxy, which reduces the chance of interference between tests.
|
Replaces #66 |
|
Thank you for this pull request! Please check this document for how the Jenkins project handles pull requests. |
|
This fix builds upon my changes, and I have verified that it still works. Getting the proxy configuration by asking Jenkins itself deals with a small annoyance we still had by having to have a correct environment when starting a slave. |
olivierdagenais
added a commit
that referenced
this pull request
Feb 26, 2016
[JENKINS-6933] Handle proxy settings
|
Thank you, @ytterx! We couldn't have done it without you.! |
olivierdagenais
pushed a commit
that referenced
this pull request
Feb 29, 2016
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.
Background
This feature was originally submitted as pull request #66 and this branch improves upon the work by pulling the proxy configuration from Jenkins itself, adding tests and contributing a small fix to the polling feature, discovered while testing.
Documentation
Here are the related changes submitted to document this new feature:
documentation_4.1.0branchManual testing
8123./jenkins/pluginManager/advanced, Prepare for Shutdown via/jenkins/quietDownthen restart Jenkins.003 Router(gateway) option in its DHCP reservation.wgetwas unable to fetch anything ("No route to host.") until I [temporarily] set thehttp_proxyenvironment variable./jenkins/pluginManager/advancedto configure the proxy server in Jenkins.Mission accomplished!