Skip to content
This repository has been archived by the owner on Apr 14, 2021. It is now read-only.

Backport #4380 (Updated certificates) to 1-12-stable #4407

Merged
merged 7 commits into from
Mar 29, 2016
Merged

Backport #4380 (Updated certificates) to 1-12-stable #4407

merged 7 commits into from
Mar 29, 2016

Conversation

RochesterinNYC
Copy link
Contributor

@indirect
Copy link
Member

@homu r+

@homu
Copy link
Contributor

homu commented Mar 28, 2016

📌 Commit c1311ce has been approved by indirect

homu added a commit that referenced this pull request Mar 28, 2016
…rect

Backport #4380 (Updated certificates) to `1-12-stable`

- Needs to be merged in before #4404 so ssl cert specs will pass
@homu
Copy link
Contributor

homu commented Mar 28, 2016

⌛ Testing commit c1311ce with merge 70e6c31...

@homu
Copy link
Contributor

homu commented Mar 28, 2016

💔 Test failed - status

@indirect
Copy link
Member

The certificate manager spec is failing? That's weird. :/ Is it because we removed the code that uses the check?

@RochesterinNYC
Copy link
Contributor Author

@indirect 28b86ac is breaking this. This commit is only on 1-12-stable. Can I add a commit onto this PR that reverts that commit?

@indirect
Copy link
Member

@RochesterinNYC we specifically need lib/bundler/ssl_certs/GlobalSignRoot.pem in order to be able to secure connections to Fastly. Should we just add that cert to RubyGems so the test will pass again?

@RochesterinNYC
Copy link
Contributor Author

@indirect Is that related to or done by rubygems/rubygems#1555 in the capacity you're thinking?

@indirect
Copy link
Member

Ah! For some reason I thought that was already merged. Once that goes in, I'll have homu retry here. Thanks!

@RochesterinNYC
Copy link
Contributor Author

@indirect Okay, I'll update this PR to add a revert for that above mentioned commit then?

@indirect
Copy link
Member

@RochesterinNYC now that I've merged the RubyGems PR, that commit should pass, right? You can add it back. :)

@RochesterinNYC
Copy link
Contributor Author

@indirect Oh okay, I think we have a miscommunication here. So, the failing spec was a CertificateManager unit spec, (not the CertificateManager integration/'other' spec that actually checks the Rubygems ssl certs on master or etc.). I think I misunderstood your comment above regarding adding a cert to Rubygems so that this failing test would pass.

The failing unit spec is failing because the setup for that unit test assumes certain things about the ssl_certs directory structure that are no longer true and the setup operations are polluted by the fact that there are certs that fit the glob **/*.pem and *.pem under ssl_certs. Cleanest way to rectify this: I can make a quick PR to master that will fix the unit spec setup and hence the unit spec, and then I can cherry pick that commit back to this PR?

@indirect
Copy link
Member

@RochesterinNYC okay, sounds good!

@indirect
Copy link
Member

@homu r+

@homu
Copy link
Contributor

homu commented Mar 29, 2016

📌 Commit c1311ce has been approved by indirect

@RochesterinNYC
Copy link
Contributor Author

@indirect I just added the cherry-picked commit from #4409 to this PR. I think the Homu r+ is approving the commit just before that cherry-picked commit though.

@indirect
Copy link
Member

Damn race conditions. :)

@homu r+

@homu
Copy link
Contributor

homu commented Mar 29, 2016

📌 Commit 82b6e99 has been approved by indirect

@homu
Copy link
Contributor

homu commented Mar 29, 2016

⌛ Testing commit 82b6e99 with merge 8186ef0...

homu added a commit that referenced this pull request Mar 29, 2016
…rect

Backport #4380 (Updated certificates) to `1-12-stable`

- Needs to be merged in before #4404 so ssl cert specs will pass
@homu
Copy link
Contributor

homu commented Mar 29, 2016

☀️ Test successful - status

@homu homu merged commit 82b6e99 into rubygems:1-12-stable Mar 29, 2016
homu added a commit that referenced this pull request Mar 29, 2016
…ificates-in-method, r=indirect

Have `CertificateManager` use new `ssl_certs` dir structure for `#certificates_in`

- Related to #4407

/cc @indirect
@coilysiren coilysiren modified the milestone: Release Archive Sep 22, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants