Skip to content

Proxy from multiple sources with priority. Custom Local Identifier fix#30

Merged
francisf merged 6 commits intojenkinsci:masterfrom
rchougule:proxy_from_env_vars
Dec 28, 2020
Merged

Proxy from multiple sources with priority. Custom Local Identifier fix#30
francisf merged 6 commits intojenkinsci:masterfrom
rchougule:proxy_from_env_vars

Conversation

@rchougule
Copy link
Copy Markdown
Contributor

@rchougule rchougule commented Dec 17, 2020

Task: https://browserstack.atlassian.net/browse/ACE-1568

Changes:

  1. Requests from the plugin for new-report generation will honor the proxy settings now. And the respective related components.
  2. Priority of proxy settings:
    a. https_proxy and http_proxy set via withEnv in Pipeline script
    b. https_proxy and http_proxy set in System level, retrieved using System.getenv
    c. Jenkins Proxy configuration
    d. JAR arguments, i.e. https.proxyHost, https.proxyPort, https.proxyUser, https.proxyPassword
  3. BrowserStack Local not honoring custom local-identifier fix. Task: https://browserstack.atlassian.net/browse/ACE-1754

Related PR for the included changes: browserstack/automate-client-java#8 - To make proxy auth params non-mandatory while reaching out to BrowserStack via the plugin.

1. PluginsTracker static to instance specific client to prevent
overriding
2. Credentials check via proxy
3. pom update for automate-client-java for optional proxy-auth params
@rchougule rchougule changed the title Proxy from various sources. Custom Local Identifier fix Proxy from multiple sources with priority. Custom Local Identifier fix Dec 17, 2020
Comment thread .gitignore
Comment thread src/main/java/com/browserstack/automate/ci/common/uploader/AppUploader.java Outdated
Copy link
Copy Markdown

@harshitvasu harshitvasu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@francisf francisf merged commit 48fd590 into jenkinsci:master Dec 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants