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

Fixed #403 - Guard new GPG key from being downloaded always #404

Merged
merged 4 commits into from Feb 21, 2017

Conversation

Projects
None yet
2 participants
@iancward
Copy link
Contributor

iancward commented Feb 13, 2017

  • Moved chefspec examples for repo out of dd-agent_spec and into repository_spec
  • Collapsed rhellions contexts since repository recipe doesn't care about python version
  • Add a few missing examples

iancward added some commits Feb 13, 2017

Fixed #403 - Guard new GPG key from being downloaded always
- Moved chefspec examples for repo out of dd-agent_spec and into repository_spec
- Collapsed rhellions contexts since repository recipe doesn't care about python version
- Add a few missing examples
@olivielpeau
Copy link
Member

olivielpeau left a comment

Thanks @iancward! This is a very welcome change, I only have one comment on the removal of one of the tests.

expect(chef_run).to create_yum_repository('datadog').with(
gpgkey: 'http://yum.datadoghq.com/DATADOG_RPM_KEY.public'
)
end

This comment has been minimized.

Copy link
@olivielpeau

olivielpeau Feb 16, 2017

Member

any reason for removing this test on RHEL <= 5?

This comment has been minimized.

Copy link
@iancward

iancward Feb 16, 2017

Author Contributor

Hi @olivielpeau I can add it back, but the repository recipe doesn't have any logic dependent on platform version. The separate test for RHEL5 wasn't actually exercising anything specific, so I thought I'd condense the spec by removing it.

This comment has been minimized.

Copy link
@olivielpeau

olivielpeau Feb 16, 2017

Member

Actually there's one RHEL5-specific thing: the yum repository has to be configured with a gpgkey downloaded through plain text http (the logic that handles that is in the default attributes file: https://github.com/DataDog/chef-datadog/blob/v2.8.1/attributes/default.rb#L85-L91).

This comment has been minimized.

Copy link
@iancward

iancward Feb 16, 2017

Author Contributor

Oooh.. good catch. This should be fixed in bc60110.

@olivielpeau olivielpeau added this to the 2.9.0 milestone Feb 16, 2017

@iancward

This comment has been minimized.

Copy link
Contributor Author

iancward commented Feb 18, 2017

It looks like https://travis-ci.org/DataDog/chef-datadog/builds/202371935 is (hopefully) caused by a temporary issue with Chef's Supermarket or connectivity to it.

@olivielpeau

This comment has been minimized.

Copy link
Member

olivielpeau commented Feb 21, 2017

Looks good now, thanks @iancward!

The CI failure was indeed a temp issue with Supermarket, just re-ran it and it passed.

@olivielpeau olivielpeau merged commit 4379f96 into DataDog:master Feb 21, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.