Skip to content
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.

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

Rebase and resolve original PR #156 to fix issue #102 from nevermindr #299

Merged
merged 2 commits into from
Mar 8, 2017

Conversation

jiamengyu
Copy link
Contributor

Resolved the conflicts and tested the proxy issue.

@jiamengyu jiamengyu changed the title Rebase and resolve original PR #156 to fix issue #102 from nevermindr #298 Rebase and resolve original PR #156 to fix issue #102 from nevermindr Mar 6, 2017
@jiamengyu jiamengyu mentioned this pull request Mar 6, 2017
@samrocketman samrocketman added this to the slack-2.2 milestone Mar 6, 2017
@samrocketman
Copy link
Member

Please squash your commits into a single commit. Once you do that, I'll review and do some testing of my own.

@samrocketman
Copy link
Member

samrocketman commented Mar 6, 2017

Also, ensure your squashed commit is rebased on the latest master. If you don't know how to squash commits then please give me write access to your repository. I can squash it for you.

@jimsonyu
Copy link

jimsonyu commented Mar 6, 2017

@samrocketman Have invited you to my reposiroty and given write access. Please squash as needed. Thank you a lot for helping.

@jiamengyu jiamengyu force-pushed the master branch 2 times, most recently from b4e3df4 to 756f3e7 Compare March 7, 2017 02:02
@jiamengyu
Copy link
Contributor Author

Done with squashing into single commit.

@samrocketman
Copy link
Member

@jiamengyu I'm going to update your commit authorship to attribute @nevermindr. I'll test this evening.

serg3k and others added 2 commits March 7, 2017 17:39
with org.apache.http.impl.client.CloseableHttpClient

added httpclient4.3.2 dependency

fixed tests

* HttpClientStub -> CloseableHttpClientStub
* getContent on response object fixed
 * Use CloseableHttpClient to replace HttpClient implementation
 * Updated test cases with CloseableHttpClientStub
 * Optimize CloseableHttpClient Response manipulation.
 * Rebased jenkinsci#156 on latest master
@samrocketman
Copy link
Member

@jiamengyu I have rebased and tried to retain the authorship from both #156 and this PR. Please approve. cc @nevermindr

@jiamengyu
Copy link
Contributor Author

Where can I approve? is there a button? or what action need to be done for approval?

@samrocketman
Copy link
Member

samrocketman commented Mar 8, 2017

@jiamengyu I just wanted you to see what I did and approve with a simple comment. I wanted to be sure I wasn't doing something you didn't like. I'm currently testing this for merge.

@jiamengyu
Copy link
Contributor Author

@samrocketman I've reviewed all the changes one more time, looks all good! Please proceed with merging if all testing passed.
Great thanks.

Copy link
Member

@samrocketman samrocketman left a comment

Choose a reason for hiding this comment

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

Testing all checked out. Thank you for rebasing and working on this. Looks good to me.

@caleyg
Copy link

caleyg commented Oct 19, 2017

double posting from #148 to try and get a response from a party who is watching...

Can anyone please give me some insight here. I'm trying to use this plugin in my Jenkins Pipeline build behind a proxy in an enterprise environment.

slackSend isn't honoring http_proxy, https_proxy, or HTTP_PROXY, HTTPS_PROXY or -Dhttp.proxyHost or -Dhttps.proxyHost.

I know Jenkins use the proxy by leveraging one of the environment variables above, because I'm able to do things like install plugins from the plugin manager, and use the proxy in various other build tasks.

But consistently the slack plugin just times out when connecting to slack.com

I'm very close to pivoting and leveraging curl to send my requests... I've tried this with slack plugin 2.2 and slack 2.3

@jimsonyu
Copy link

jimsonyu commented Oct 19, 2017 via email

@jiamengyu
Copy link
Contributor Author

@caleyg Login to your jenkins instance, go to "Manage Jenkins", then click "Manage plugins", then click Tab: advanced, then fill your "HTTP Proxy Configuration".
Your SlackSend should be working as expected behind enterprise proxy.

@caleyg
Copy link

caleyg commented Oct 19, 2017 via email

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.

5 participants